Merge [SD2]

r1095 Correct one spellId in hyjal - skip
r1096 Remove more grid search code from scripts and use functions.
r1097 Remove obsolete functions redefined in 1094
r1098 Added text for bosses in map 615
r1099 Added instance script for map 615

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 3dbdd4899a1..a7a57818df7 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -414,6 +414,9 @@ extern void AddSC_boss_ormorok();
 extern void AddSC_boss_keristrasza();
 extern void AddSC_instance_nexus();
 
+//Obsidian Sanctum
+extern void AddSC_instance_obsidian_sanctum();
+
 //Onyxia's Lair
 extern void AddSC_boss_onyxia();
 
@@ -1315,6 +1318,9 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
     AddSC_boss_keristrasza();
     AddSC_instance_nexus();
 
+    //Obsidian Sanctum
+    AddSC_instance_obsidian_sanctum();
+
     //Onyxia's Lair
     AddSC_boss_onyxia();