diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
commit | b62b10dd260c8c01e82e5b206c17a410cedc79f4 (patch) | |
tree | 2ea582bb63476566ddabfbd5a0a8f3747eb3fc8e /indra/newview/llfloaterworldmap.cpp | |
parent | bef304c0a34bfcd7997bd7799995229ddcc1de31 (diff) | |
parent | 51311875b6e23fa9475c42b6d15637aa668729c5 (diff) |
Post-convert merge by convert_monolith.py from ./viewer-experience
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
-rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 3afa31b873..7236894542 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -199,7 +199,6 @@ LLFloaterWorldMap::LLFloaterWorldMap(const LLSD& key) mFactoryMap["objects_mapview"] = LLCallbackMap(createWorldMapView, NULL); - //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_world_map.xml", FALSE); mCommitCallbackRegistrar.add("WMap.Coordinates", boost::bind(&LLFloaterWorldMap::onCoordinatesCommit, this)); mCommitCallbackRegistrar.add("WMap.Location", boost::bind(&LLFloaterWorldMap::onLocationCommit, this)); mCommitCallbackRegistrar.add("WMap.AvatarCombo", boost::bind(&LLFloaterWorldMap::onAvatarComboCommit, this)); |