summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterbuildoptions.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-08-05 16:10:15 -0400
committerNat Goodspeed <nat@lindenlab.com>2009-08-05 16:10:15 -0400
commit07129bf928f79246849e66b396fab44a7a228216 (patch)
treee4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llfloaterbuildoptions.cpp
parent03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff)
parentdc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff)
Merge recent changes
Diffstat (limited to 'indra/newview/llfloaterbuildoptions.cpp')
-rw-r--r--indra/newview/llfloaterbuildoptions.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbuildoptions.cpp b/indra/newview/llfloaterbuildoptions.cpp
index 9dbd1db38e..30e9428df9 100644
--- a/indra/newview/llfloaterbuildoptions.cpp
+++ b/indra/newview/llfloaterbuildoptions.cpp
@@ -44,7 +44,7 @@
// Methods
//
LLFloaterBuildOptions::LLFloaterBuildOptions(const LLSD& key)
- : LLFloater()
+ : LLFloater(key)
{
//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_build_options.xml");
}