Second Life viewer sources 1.14.0.0

1 files changed, 20 insertions, 10 deletions

diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 05dd70b..f777581 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -264,7 +264,7 @@ BOOL	LLFloaterTools::postBuild()
                         &LLToolPlacerPanel::sTriangleTorus,
                         &LLToolPlacerPanel::sTree,
                         &LLToolPlacerPanel::sGrass};
-        for(int t=0;t<sizeof(toolNames)/sizeof(toolNames[0]);t++)
+        for(size_t t=0; t<sizeof(toolNames)/sizeof(toolNames[0]); ++t)
         {
                 LLButton *found = LLViewerUICtrlFactory::getButtonByName(this,toolNames[t]);
                 if(found)
@@ -395,7 +395,7 @@ LLFloaterTools::LLFloaterTools()
         factory_map["ContentsInventory"] = LLCallbackMap(createPanelContentsInventory, this);//LLPanelContents
         factory_map["land info panel"] = LLCallbackMap(createPanelLandInfo, this);//LLPanelLandInfo
 
-        gUICtrlFactory->buildFloater(this,"floater_tools.xml",&factory_map);
+        gUICtrlFactory->buildFloater(this,"floater_tools.xml",&factory_map,FALSE);
 
         mLargeHeight = getRect().getHeight();
         mSmallHeight = mLargeHeight;
@@ -478,7 +478,7 @@ void LLFloaterTools::resetToolState()
 
 void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 {
-        LLTool *tool = gToolMgr->getCurrentTool( mask );
+        LLTool *tool = gToolMgr->getCurrentTool();
 
         // HACK to allow seeing the buttons when you have the app in a window.
         // Keep the visibility the same as it 
@@ -579,7 +579,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                 S32 index = mComboGridMode->getCurrentIndex();
                 mComboGridMode->removeall();
 
-                switch (gSelectMgr->getSelectType())
+                switch (mObjectSelection->getSelectType())
                 {
                 case SELECT_TYPE_HUD:
                         mComboGridMode->add("Screen");
@@ -726,6 +726,13 @@ BOOL LLFloaterTools::canClose()
 }
 
 // virtual
+void LLFloaterTools::onOpen()
+{
+        mParcelSelection = gParcelMgr->getFloatingParcelSelection();
+        mObjectSelection = gSelectMgr->getEditSelection();
+}
+
+// virtual
 void LLFloaterTools::onClose(bool app_quitting)
 {
         setMinimized(FALSE);
@@ -744,10 +751,14 @@ void LLFloaterTools::onClose(bool app_quitting)
 
         resetToolState();
 
+        mParcelSelection = NULL;
+        mObjectSelection = NULL;
+
         // Switch back to basic toolset
-        gCurrentToolset = gBasicToolset;
-        gBasicToolset->selectFirstTool();
-        gToolMgr->useSelectedTool( gBasicToolset );
+        gToolMgr->setCurrentToolset(gBasicToolset);
+        // we were already in basic toolset, using build tools
+        // so manually reset tool to default (pie menu tool)
+        gToolMgr->getCurrentToolset()->selectFirstTool();
 }
 
 void LLFloaterTools::showMore(BOOL show_more)
@@ -955,6 +966,5 @@ void LLFloaterTools::setEditTool(void* tool_pointer)
 
 void LLFloaterTools::onFocusReceived()
 {
-        gCurrentToolset = gBasicToolset;
-        gCurrentToolset->selectTool(gCurrentToolset->getSelectedTool());
-}
\ No newline at end of file
+        gToolMgr->setCurrentToolset(gBasicToolset);
+}