[svn] * Merge Temp dev SVN with Assembla.

* Changes include:
   - Implementation of w12x's Outdoor PvP and Game Event Systems.
   - Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed).
   - All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql).
   - Improved Config cleanup.
   - And many more changes.

--HG--
branch : trunk

1 files changed, 1 insertions, 1 deletions

diff --git a/contrib/vmap_debugger/ModelContainerView.h b/contrib/vmap_debugger/ModelContainerView.h
index 28d992a0c16..ff41f7d1784 100644
--- a/contrib/vmap_debugger/ModelContainerView.h
+++ b/contrib/vmap_debugger/ModelContainerView.h
@@ -51,7 +51,7 @@ namespace VMAP
         bool iPosSent;
         Array<Command> iPrevLoadCommands;
 	private:
-		Vector3 convertPositionToMangosRep(float x, float y, float z) const;
+		Vector3 convertPositionToTrinityRep(float x, float y, float z) const;
 
 	public:
 		ModelContainerView(const G3D::GApp::Settings& settings);