Untitled

Index: src/mangosd/Makefile.am
===================================================================
--- src/mangosd/Makefile.am	(revision 5049)
+++ src/mangosd/Makefile.am	(working copy)
@@ -33,8 +33,8 @@
 	WorldRunnable.h
 
 ## Link world daemon against the shared library
-mangos_worldd_LDADD = ../bindings/universal/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a  ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
-mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/zthread -L../../dep/src/g3dlite -L../bindings/universal/ $(MYSQL_LIBS) $(POSTGRE_LIBS) -L$(libdir) $(ZLIB) $(COMPATLIB) $(SSLLIB) -export-dynamic
+mangos_worldd_LDADD = ../bindings/ScriptDev2/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a  ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
+mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/zthread -L../../dep/src/g3dlite -L../bindings/ScriptDev2/ $(MYSQL_LIBS) $(POSTGRE_LIBS) -L$(libdir) $(ZLIB) $(COMPATLIB) $(SSLLIB) -export-dynamic
 
 ## Additional files to include when running 'make dist'
 #  Include world daemon configuration
Index: src/bindings/Makefile.am
===================================================================
--- src/bindings/Makefile.am	(revision 5049)
+++ src/bindings/Makefile.am	(working copy)
@@ -14,4 +14,4 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SUBDIRS = universal
+SUBDIRS = ScriptDev2
Index: configure.ac
===================================================================
--- configure.ac	(revision 5049)
+++ configure.ac	(working copy)
@@ -228,7 +228,10 @@
    src/mangosd/Makefile
    src/mangosd/mangosd.conf
    src/bindings/Makefile
-   src/bindings/universal/Makefile
+   src/bindings/ScriptDev2/Makefile
+   src/bindings/ScriptDev2/config.h
+   src/bindings/ScriptDev2/sql/Makefile
+   src/bindings/ScriptDev2/sql/Updates/Makefile
 ])
 
 ## Disabled Makefiles, until they are ready for a successful make and
Index: src/bindings/ScriptDev2/config.h.in
===================================================================
--- config.h.in	(revision 249)
+++ config.h.in	(working copy)
@@ -53,5 +53,5 @@
   #define _SCRIPTDEV2_CONFIG  "scriptdev2.conf"
 #else
   #define _FULLVERSION _VERSION " (Unix)"
-  #define _SCRIPTDEV2_CONFIG  "@prefix@/etc/scriptdev2.conf"
+  #define _SCRIPTDEV2_CONFIG  "/home/wow/server/etc/scriptdev2.conf"
 #endif
Index: src/game/Channel.cpp
===================================================================
--- src/game/Channel.cpp	(revision 5149)
+++ src/game/Channel.cpp	(working copy)
@@ -98,7 +98,7 @@
     if(m_announce && (!plr || plr->GetSession()->GetSecurity() < SEC_GAMEMASTER || !sWorld.getConfig(CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL) ))
     {
         MakeJoined(&data, p);
-        SendToAll(&data);
+        //SendToAll(&data);
     }
 
     data.clear();
@@ -111,7 +111,7 @@
     MakeYouJoined(&data);
     SendToOne(&data, p);
 
-    JoinNotify(p);
+    //JoinNotify(p);
 
     // if no owner first logged will become
     if(!IsConstant() && !m_ownerGUID)
@@ -153,10 +153,10 @@
         {
             WorldPacket data;
             MakeLeft(&data, p);
-            SendToAll(&data);
+            //SendToAll(&data);
         }
 
-        LeaveNotify(p);
+        //LeaveNotify(p);
 
         if(changeowner)
         {
Index: src/bindings/ScriptDev2/config.h
===================================================================
--- config.h.in	(revision 249)
+++ config.h.in	(working copy)
@@ -53,5 +53,5 @@
   #define _SCRIPTDEV2_CONFIG  "scriptdev2.conf"
 #else
   #define _FULLVERSION _VERSION " (Unix)"
-  #define _SCRIPTDEV2_CONFIG  "@prefix@/etc/scriptdev2.conf"
+  #define _SCRIPTDEV2_CONFIG  "/home/wow/server/etc/scriptdev2.conf"
 #endif