diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
commit | 42e397e155239932a75fa694dc77d9dd952e3c09 (patch) | |
tree | 1d3cb00d99a585879facf6dce5b7133dbd8ad6da /indra/newview/llfloaterenvsettings.cpp | |
parent | a63b83775120f7ebe3bafb897da70e4e41bda6a4 (diff) | |
parent | c683151587067cb2758206432610d4ff4884036e (diff) |
Merged from 2.3.0-beta1 tag in viewer-development
Diffstat (limited to 'indra/newview/llfloaterenvsettings.cpp')
-rw-r--r-- | indra/newview/llfloaterenvsettings.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterenvsettings.cpp b/indra/newview/llfloaterenvsettings.cpp index 337d4934e1..fcaef1f34b 100644 --- a/indra/newview/llfloaterenvsettings.cpp +++ b/indra/newview/llfloaterenvsettings.cpp @@ -50,7 +50,6 @@ LLFloaterEnvSettings::LLFloaterEnvSettings(const LLSD& key) : LLFloater(key) { - //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_env_settings.xml"); } // virtual LLFloaterEnvSettings::~LLFloaterEnvSettings() |