diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
| commit | ade6bbb06c6a842f39a3fe32decf7c66682df092 (patch) | |
| tree | 8fa1e4ba680f916bb4c77c70f2464f295a3bd3f3 /indra/newview/llfloatertools.cpp | |
| parent | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (diff) | |
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 62a8c0d27e..4bcf470317 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -45,6 +45,7 @@ #include "lldraghandle.h" #include "llfloaterbuildoptions.h" #include "llfloateropenobject.h" +#include "llfloaterreg.h" #include "llfocusmgr.h" #include "llmenugl.h" #include "llpanelcontents.h" @@ -952,7 +953,7 @@ void LLFloaterTools::setObjectType( LLPCode pcode ) void LLFloaterTools::onClickGridOptions(void* data) { //LLFloaterTools* floaterp = (LLFloaterTools*)data; - LLFloaterBuildOptions::showInstance(); + LLFloaterReg::showInstance("build_options"); // RN: this makes grid options dependent on build tools window //floaterp->addDependentFloater(LLFloaterBuildOptions::getInstance(), FALSE); } |