diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/lltoolface.cpp | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/lltoolface.cpp')
| -rw-r--r-- | indra/newview/lltoolface.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp index d06e41c771..b335d7125a 100644 --- a/indra/newview/lltoolface.cpp +++ b/indra/newview/lltoolface.cpp @@ -36,14 +36,13 @@ #include "lltoolface.h" // Library includes +#include "llfloaterreg.h" #include "v3math.h" // Viewer includes #include "llagent.h" -//#include "llbuildview.h" #include "llviewercontrol.h" #include "llselectmgr.h" -#include "lltoolview.h" #include "llviewerobject.h" #include "llviewerwindow.h" #include "llfloatertools.h" @@ -67,9 +66,7 @@ BOOL LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask) { // You should already have an object selected from the mousedown. // If so, show its properties - //gBuildView->showFacePanel(); - gFloaterTools->showPanel( LLFloaterTools::PANEL_FACE ); - //gBuildView->showMore(LLBuildView::PANEL_FACE); + LLFloaterReg::showInstance("build", "Texture"); return TRUE; } else |