1 files changed, 25 insertions, 16 deletions

diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 9ce5d35..1498d4a 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -83,13 +83,13 @@
 LLFloaterTools *gFloaterTools = NULL;
 
 
-const LLString PANEL_NAMES[LLFloaterTools::PANEL_COUNT] =
+const std::string PANEL_NAMES[LLFloaterTools::PANEL_COUNT] =
 {
-        LLString("General"),    // PANEL_GENERAL,
-        LLString("Object"),     // PANEL_OBJECT,
-        LLString("Features"),   // PANEL_FEATURES,
-        LLString("Texture"),    // PANEL_FACE,
-        LLString("Content"),    // PANEL_CONTENTS,
+        std::string("General"),         // PANEL_GENERAL,
+        std::string("Object"),  // PANEL_OBJECT,
+        std::string("Features"),        // PANEL_FEATURES,
+        std::string("Texture"), // PANEL_FACE,
+        std::string("Content"), // PANEL_CONTENTS,
 };
 
 // Local prototypes
@@ -159,7 +159,7 @@ void*	LLFloaterTools::createPanelContents(void* data)
 void*   LLFloaterTools::createPanelContentsInventory(void* data)
 {
         LLFloaterTools* floater = (LLFloaterTools*)data;
-        floater->mPanelContents->mPanelInventory = new LLPanelInventory("ContentsInventory", LLRect());
+        floater->mPanelContents->mPanelInventory = new LLPanelInventory(std::string("ContentsInventory"), LLRect());
         return floater->mPanelContents->mPanelInventory;
 }
 
@@ -167,7 +167,7 @@ void*	LLFloaterTools::createPanelContentsInventory(void* data)
 void*   LLFloaterTools::createPanelLandInfo(void* data)
 {
         LLFloaterTools* floater = (LLFloaterTools*)data;
-        floater->mPanelLandInfo = new LLPanelLandInfo("land info panel");
+        floater->mPanelLandInfo = new LLPanelLandInfo(std::string("land info panel"));
         return floater->mPanelLandInfo;
 }
 
@@ -237,7 +237,7 @@ BOOL	LLFloaterTools::postBuild()
         // Create Buttons
         //
 
-        static  const LLString  toolNames[]={
+        static  const std::string       toolNames[]={
                         "ToolCube",
                         "ToolPrism",
                         "ToolPyramid",
@@ -304,11 +304,14 @@ BOOL	LLFloaterTools::postBuild()
         childSetCommitCallback("radio revert",click_popup_dozer_mode,  (void*)5);
         mBtnApplyToSelection = getChild<LLButton>("button apply to selection");
         childSetAction("button apply to selection",click_apply_to_selection,  (void*)0);
+        mCheckShowOwners = getChild<LLCheckBoxCtrl>("checkbox show owners");
+        childSetValue("checkbox show owners",gSavedSettings.getBOOL("ShowParcelOwners"));
 
         mSliderDozerSize = getChild<LLSlider>("slider brush size");
         childSetCommitCallback("slider brush size", commit_slider_dozer_size,  (void*)0);
         childSetValue( "slider brush size", gSavedSettings.getS32("LandBrushSize"));
         
+
         mSliderDozerForce = getChild<LLSlider>("slider force");
         childSetCommitCallback("slider force",commit_slider_dozer_force,  (void*)0);
         // the setting stores the actual force multiplier, but the slider is logarithmic, so we convert here
@@ -341,7 +344,7 @@ BOOL	LLFloaterTools::postBuild()
 // Create the popupview with a dummy center.  It will be moved into place
 // during LLViewerWindow's per-frame hover processing.
 LLFloaterTools::LLFloaterTools()
-:       LLFloater("toolbox floater"),
+:       LLFloater(std::string("toolbox floater")),
         mBtnFocus(NULL),
         mBtnMove(NULL),
         mBtnEdit(NULL),
@@ -392,6 +395,8 @@ LLFloaterTools::LLFloaterTools()
         mSliderDozerSize(NULL),
         mSliderDozerForce(NULL),
         mBtnApplyToSelection(NULL),
+        mCheckShowOwners(NULL),
+
 
         mTab(NULL),
         mPanelPermissions(NULL),
@@ -741,10 +746,14 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                 childSetVisible("Brush:", land_visible);
                 childSetVisible("Brush Size:", land_visible);
         }
+        if (mCheckShowOwners)
+        {
+                mCheckShowOwners        ->setVisible( land_visible );
+        }
         if (mSliderDozerForce)
         {
                 mSliderDozerForce       ->setVisible( land_visible );
-                childSetVisible("Force:", land_visible);
+                childSetVisible("Strength:", land_visible);
         }
 
         //
@@ -770,8 +779,8 @@ void LLFloaterTools::onOpen()
         mParcelSelection = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection();
         mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
         
-        gMenuBarView->setItemVisible("Tools", TRUE);
-        gMenuBarView->arrange();
+        // gMenuBarView->setItemVisible(std::string("Tools"), TRUE);
+        // gMenuBarView->arrange();
 }
 
 // virtual
@@ -804,8 +813,8 @@ void LLFloaterTools::onClose(bool app_quitting)
         // so manually reset tool to default (pie menu tool)
         LLToolMgr::getInstance()->getCurrentToolset()->selectFirstTool();
 
-        gMenuBarView->setItemVisible("Tools", FALSE);
-        gMenuBarView->arrange();
+        // gMenuBarView->setItemVisible(std::string("Tools"), FALSE);
+        // gMenuBarView->arrange();
 }
 
 void LLFloaterTools::showMore(BOOL show_more)
@@ -995,7 +1004,7 @@ void LLFloaterTools::setObjectType( void* data )
         LLPCode pcode = *(LLPCode*) data;
         LLToolPlacer::setObjectType( pcode );
         gSavedSettings.setBOOL("CreateToolCopySelection", FALSE);
-        gViewerWindow->setMouseCapture(NULL);
+        gFocusMgr.setMouseCapture(NULL);
 }
 
 // static