Merge branch 'land-tools' into next-merge

8 files changed, 191 insertions, 86 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e31c149..cdf9fb4 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4164,6 +4164,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LandBrushForce</key>
+    <map>
+      <key>Comment</key>
+      <string>Multiplier for land modification brush force.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>1.0</real>
+    </map>
     <key>Language</key>
     <map>
       <key>Comment</key>
@@ -5558,7 +5569,7 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>RadioLandBrushSize</key>
+    <key>LandBrushSize</key>
     <map>
       <key>Comment</key>
       <string>Size of land modification brush (0 = small, 1 = medium, 2 = large)</string>
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 97150e3..9ce5d35 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -54,6 +54,7 @@
 #include "llpanelvolume.h"
 #include "llpanelpermissions.h"
 #include "llselectmgr.h"
+#include "llslider.h"
 #include "llstatusbar.h"
 #include "lltabcontainer.h"
 #include "lltextbox.h"
@@ -105,8 +106,8 @@ void click_popup_rotate_left(void*);
 void click_popup_rotate_reset(void*);
 void click_popup_rotate_right(void*);
 void click_popup_dozer_mode(LLUICtrl *, void *user);
-void click_popup_dozer_size(LLUICtrl *, void *user);
-void click_dozer_size(LLUICtrl *, void*);
+void commit_slider_dozer_size(LLUICtrl *, void*);
+void commit_slider_dozer_force(LLUICtrl *, void*);
 void click_apply_to_selection(void*);
 void commit_radio_zoom(LLUICtrl *, void*);
 void commit_radio_orbit(LLUICtrl *, void*);
@@ -301,13 +302,18 @@ BOOL	LLFloaterTools::postBuild()
         childSetCommitCallback("radio noise",click_popup_dozer_mode,  (void*)4);
         mRadioDozerRevert = getChild<LLCheckBoxCtrl>("radio revert");
         childSetCommitCallback("radio revert",click_popup_dozer_mode,  (void*)5);
-        mComboDozerSize = getChild<LLComboBox>("combobox brush size");
-        childSetCommitCallback("combobox brush size",click_dozer_size,  (void*)0);
-        if(mComboDozerSize) mComboDozerSize->setCurrentByIndex(0);
         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
+        childSetValue( "slider force", log10(gSavedSettings.getF32("LandBrushForce")));
+
         childSetAction("button more", click_show_more, this);
         childSetAction("button less", click_show_more, this);
         mTab = getChild<LLTabContainer>("Object Info Tabs");
@@ -383,10 +389,9 @@ LLFloaterTools::LLFloaterTools()
         mRadioDozerSmooth(NULL),
         mRadioDozerNoise(NULL),
         mRadioDozerRevert(NULL),
-        mComboDozerSize(NULL),
+        mSliderDozerSize(NULL),
+        mSliderDozerForce(NULL),
         mBtnApplyToSelection(NULL),
-        mCheckShowOwners(NULL),
-
 
         mTab(NULL),
         mPanelPermissions(NULL),
@@ -694,7 +699,6 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
         if (mRadioSelectLand)   mRadioSelectLand->setVisible( land_visible );
 
         S32 dozer_mode = gSavedSettings.getS32("RadioLandBrushAction");
-        S32 dozer_size = gSavedSettings.getS32("RadioLandBrushSize");
 
         if (mRadioDozerFlatten)
         {
@@ -726,20 +730,21 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                 mRadioDozerRevert       ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 5);
                 mRadioDozerRevert       ->setVisible( land_visible );
         }
-        if (mComboDozerSize)
-        {
-                mComboDozerSize         ->setCurrentByIndex(dozer_size);
-                mComboDozerSize         ->setVisible( land_visible );
-                mComboDozerSize         ->setEnabled( tool == LLToolBrushLand::getInstance() );
-        }
         if (mBtnApplyToSelection)
         {
                 mBtnApplyToSelection->setVisible( land_visible );
                 mBtnApplyToSelection->setEnabled( land_visible && !LLViewerParcelMgr::getInstance()->selectionEmpty() && tool != LLToolSelectLand::getInstance());
         }
-        if (mCheckShowOwners)
+        if (mSliderDozerSize)
         {
-                mCheckShowOwners        ->setVisible( land_visible );
+                mSliderDozerSize        ->setVisible( land_visible );
+                childSetVisible("Brush:", land_visible);
+                childSetVisible("Brush Size:", land_visible);
+        }
+        if (mSliderDozerForce)
+        {
+                mSliderDozerForce       ->setVisible( land_visible );
+                childSetVisible("Force:", land_visible);
         }
 
         //
@@ -920,25 +925,27 @@ void click_popup_rotate_right(void*)
 
 void click_popup_dozer_mode(LLUICtrl *, void *user)
 {
-        S32 show_owners = gSavedSettings.getBOOL("ShowParcelOwners");
         S32 mode = (S32)(intptr_t) user;
         gFloaterTools->setEditTool( LLToolBrushLand::getInstance() );
         gSavedSettings.setS32("RadioLandBrushAction", mode);
-        gSavedSettings.setBOOL("ShowParcelOwners", show_owners);
 }
 
-void click_popup_dozer_size(LLUICtrl *, void *user)
+void commit_slider_dozer_size(LLUICtrl *ctrl, void*)
 {
-        S32 size = (S32)(intptr_t) user;
-        gSavedSettings.setS32("RadioLandBrushSize", size);
+        S32 size = (S32)ctrl->getValue().asInteger();
+        gSavedSettings.setS32("LandBrushSize", size);
 }
 
-void click_dozer_size(LLUICtrl *ctrl, void *user)
+void commit_slider_dozer_force(LLUICtrl *ctrl, void*)
 {
-        S32 size = ((LLComboBox*) ctrl)->getCurrentIndex();
-        gSavedSettings.setS32("RadioLandBrushSize", size);
+        // the slider is logarithmic, so we exponentiate to get the actual force multiplier
+        F32 dozer_force = pow(10.f, (F32)ctrl->getValue().asReal());
+        gSavedSettings.setF32("LandBrushForce", dozer_force);
 }
 
+
+
+
 void click_apply_to_selection(void* user)
 {
         LLToolBrushLand::getInstance()->modifyLandInSelectionGlobal();
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index b0a804b..3d8a144 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -48,6 +48,7 @@ class LLPanelContents;
 class LLPanelFace;
 class LLPanelLandInfo;
 class LLComboBox;
+class LLSlider;
 class LLParcelSelection;
 class LLObjectSelection;
 
@@ -167,10 +168,10 @@ public:
         LLCheckBoxCtrl  *mRadioDozerSmooth;
         LLCheckBoxCtrl  *mRadioDozerNoise;
         LLCheckBoxCtrl  *mRadioDozerRevert;
+        LLSlider                *mSliderDozerSize;
+        LLSlider                *mSliderDozerForce;
 
-        LLComboBox              *mComboDozerSize;
         LLButton                *mBtnApplyToSelection;
-        LLCheckBoxCtrl  *mCheckShowOwners;
 
         std::vector<LLButton*>  mButtons;//[ 15 ];
 
diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp
index be05703..1a7892d 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -37,10 +37,13 @@
 
 #include "llagent.h"
 #include "llbutton.h"
+#include "llcheckboxctrl.h"
 #include "llfloaterland.h"
 #include "lltextbox.h"
+#include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
+#include "llviewerwindow.h"
 #include "roles_constants.h"
 
 #include "lluictrlfactory.h"
@@ -65,6 +68,10 @@ BOOL	LLPanelLandInfo::postBuild()
         childSetAction("button subdivide land",onClickDivide,this);
         childSetAction("button join land",onClickJoin,this);
         childSetAction("button about land",onClickAbout,this);
+        childSetAction("button show owners help", onShowOwnersHelp, this);
+
+        mCheckShowOwners = getChild<LLCheckBoxCtrl>("checkbox show owners");
+        childSetValue("checkbox show owners", gSavedSettings.getBOOL("ShowParcelOwners"));
 
         return TRUE;
 }
@@ -72,7 +79,8 @@ BOOL	LLPanelLandInfo::postBuild()
 // Methods
 //
 LLPanelLandInfo::LLPanelLandInfo(const std::string& name)
-:       LLPanel(name)
+:       LLPanel(name),
+        mCheckShowOwners(NULL)
 {
         if (!sInstance)
         {
@@ -255,3 +263,19 @@ void LLPanelLandInfo::onClickAbout(void*)
 
         LLFloaterLand::showInstance();
 }
+
+void LLPanelLandInfo::onShowOwnersHelp(void* user_data)
+{
+        LLPanelLandInfo* self = static_cast<LLPanelLandInfo*>(user_data);
+
+        const char* xml_alert = "ShowOwnersHelp";
+        LLAlertDialog* dialogp = gViewerWindow->alertXml(xml_alert);
+        if (dialogp)
+        {
+                LLFloater* root_floater = gFloaterView->getParentFloater(self);
+                if (root_floater)
+                {
+                        root_floater->addDependentFloater(dialogp);
+                }
+        }       
+}
diff --git a/linden/indra/newview/llpanelland.h b/linden/indra/newview/llpanelland.h
index c83bf2c..c44cb9d 100644
--- a/linden/indra/newview/llpanelland.h
+++ b/linden/indra/newview/llpanelland.h
@@ -50,6 +50,8 @@ public:
 
         void refresh();
         static void refreshAll();
+        
+        LLCheckBoxCtrl  *mCheckShowOwners;
 
 protected:
         static void onClickClaim(void*);
@@ -57,6 +59,7 @@ protected:
         static void onClickDivide(void*);
         static void onClickJoin(void*);
         static void onClickAbout(void*);
+        static void onShowOwnersHelp(void*);
 
 protected:
         //LLTextBox*            mTextPriceLabel;
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 89cb0b6..0291eab 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -96,7 +96,7 @@ LLToolBrushLand::LLToolBrushLand()
         mGotHover(FALSE),
         mBrushSelected(FALSE)
 {
-        mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize");
+        mBrushIndex = gSavedSettings.getS32("LandBrushSize");
 }
 
 void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
@@ -154,7 +154,7 @@ void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
                 regionp->forceUpdate();
 
                 // tell the simulator what we've done
-                F32 seconds = 1.0f / gFPSClamped;
+                F32 seconds = (1.0f / gFPSClamped) * gSavedSettings.getF32("LandBrushForce");
                 F32 x_pos = (F32)pos_region.mV[VX];
                 F32 y_pos = (F32)pos_region.mV[VY];
                 U8 brush_size = (U8)mBrushIndex;
@@ -242,7 +242,7 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
         
                 min_region.clamp(0.f, regionp->getWidth());
                 max_region.clamp(0.f, regionp->getWidth());
-                F32 seconds = 1.0f;
+                F32 seconds = gSavedSettings.getF32("LandBrushForce");
 
                 LLSurface &land = regionp->getLand();
                 char action = E_LAND_LEVEL;
@@ -251,21 +251,23 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
                 case 0:
                 //      // average toward mStartingZ
                         action = E_LAND_LEVEL;
-                        seconds = 1.f;
+                        seconds *= 0.25f;
                         break;
                 case 1:
                         action = E_LAND_RAISE;
+                        seconds *= 0.25f;
                         break;
                 case 2:
                         action = E_LAND_LOWER;
+                        seconds *= 0.25f;
                         break;
                 case 3:
                         action = E_LAND_SMOOTH;
-                        seconds = 10.f;
+                        seconds *= 5.0f;
                         break;
                 case 4:
                         action = E_LAND_NOISE;
-                        seconds = 0.5f;
+                        seconds *= 0.5f;
                         break;
                 case 5:
                         action = E_LAND_REVERT;
@@ -445,7 +447,7 @@ void LLToolBrushLand::render()
                         spot.mdV[VX] = floor( spot.mdV[VX] + 0.5 );
                         spot.mdV[VY] = floor( spot.mdV[VY] + 0.5 );
 
-                        mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize");
+                        mBrushIndex = gSavedSettings.getS32("LandBrushSize");
                         region_list_t regions;
                         determineAffectedRegions(regions, spot);
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index c7ec62f..4bf5ff1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -1996,6 +1996,19 @@ Join land?
                         Cancel
                 </option>
         </alert>
+        <alert name="ShowOwnersHelp">
+                <message name="message">
+                        If this box is checked, land parcels will be
+overlaid with a color indicating their status.
+                        
+Red: Land owned by others.
+Green: Your land.
+Aqua: Land owned by a group that you are a member of.
+Yellow: For sale.
+Purple: Land in the auction system.
+Grey: Rare public land.
+                </message>
+        </alert>        
         <alert modal="true" name="ConfirmNotecardSave">
                 <message name="message">
                         This notecard needs to be saved before the item can be copied or viewed. Save notecard?
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index c98c2ac..b5e36f6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -245,46 +245,65 @@
 
 <!-- Land panel -->
 
-        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
+        <check_box bottom="-69" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Select Land" left="4" mouse_opaque="true"
              name="radio select land" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Flatten Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Flatten" left="4" mouse_opaque="true"
              name="radio flatten" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Raise Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Raise" left="4" mouse_opaque="true"
              name="radio raise" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Lower Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Lower" left="4" mouse_opaque="true"
              name="radio lower" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Smooth Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Smooth" left="4" mouse_opaque="true"
              name="radio smooth" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Roughen Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Roughen" left="4" mouse_opaque="true"
              name="radio noise" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Revert Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Revert" left="4" mouse_opaque="true"
              name="radio revert" radio_style="true" width="114" />
-        <combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18" left="118"
-             max_chars="20" mouse_opaque="true" name="combobox brush size" width="134">
-                <combo_item name="Small" value="Small">
-                        Small
-                </combo_item>
-                <combo_item name="Medium" value="Medium">
-                        Medium
-                </combo_item>
-                <combo_item name="Large" value="Large">
-                        Large
-                </combo_item>
-        </combo_box>
-        <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
-             height="16" label="Apply to selection" label_selected="Apply to selection"
+
+
+        <button bottom="-74" follows="left|top" font="SansSerifSmall" halign="center"
+             height="20" label="Apply to selection" label_selected="Apply to selection"
              left="118" mouse_opaque="true" name="button apply to selection"
              scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
-        <check_box bottom_delta="-20" control_name="ShowParcelOwners" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false" label="Show Owners"
-             left="118" mouse_opaque="true" name="checkbox show owners" width="134" />
+
+
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
+             border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118"
+             hidden="false" mouse_opaque="true" name="Brush:" v_pad="0" width="100">
+                  Brush:
+        </text>
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
+             border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
+             hidden="false" mouse_opaque="true" name="Brush Size:" v_pad="0" width="100">
+                  Size
+        </text>
+        <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
+             increment="1.0" initial_val="0.0" left="178" max_val="2.0" min_val="0.0"
+             mouse_opaque="true" name="slider brush size" width="80" /> 
+
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
+             border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
+              hidden="false" mouse_opaque="true" name="Strength:" v_pad="0" width="100">
+                  Strength
+        </text>
+        <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
+             increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
+             mouse_opaque="true" name="slider force" width="80" />      
+
+
         <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
              height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
              name="button more" scale_image="TRUE" tool_tip="Advanced Options"
@@ -1176,34 +1195,59 @@
         <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
              name="land info panel" width="272">
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom="-18" drop_shadow_visible="true" follows="left|top"
-                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+                     bottom="-40" drop_shadow_visible="true" follows="left|top"
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+                     mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
+                        Modify Parcel
+                </text>
+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+                     height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
+                     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
+                     width="112" />
+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+                     height="20" label="Join..." label_selected="Join..." left="48"
+                     mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
+                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+                     mouse_opaque="true" name="label_parcel_info" v_pad="0" width="150">
+                        Parcel Information
+                </text>
+                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
                      mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
                         Price: L$[PRICE] for [AREA] sq. m.
                 </text>
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                     mouse_opaque="true" name="label_area" v_pad="0" width="128">
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
+                     mouse_opaque="true" name="label_area" v_pad="0" width="150">
                         Area: [AREA] sq. m.
                 </text>
-                <button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Buy Land..." label_selected="Buy Land..." left="76"
-                     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="102" />
                 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Abandon Land..." label_selected="Abandon Land..."
-                     left="76" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
-                     width="102" />
+                     height="20" label="About Land..." label_selected="About Land..." left="48"
+                     mouse_opaque="true" name="button about land" scale_image="TRUE" width="112" />
+                <check_box bottom_delta="-24" control_name="ShowParcelOwners" follows="left|top"
+                     tool_tip="Colour parcels according to their status" font="SansSerifSmall"
+                     height="16" initial_value="false" label="Show Status" left="48" 
+                     mouse_opaque="true" name="checkbox show owners" width="100" />
+                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+                             height="18" label="?" label_selected="?" left_delta="94"
+                             mouse_opaque="true" name="button show owners help" width="18" />
+                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+                     mouse_opaque="true" name="label_parcel_trans" v_pad="0" width="150">
+                        Land Transactions
+                </text>
                 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Subdivide..." label_selected="Subdivide..." left="76"
-                     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
-                     width="102" />
+                     height="20" label="Buy Land..." label_selected="Buy Land..." left="48"
+                     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="112" />
                 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Join..." label_selected="Join..." left="76"
-                     mouse_opaque="true" name="button join land" scale_image="TRUE" width="102" />
-                <button bottom_delta="-40" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="About Land..." label_selected="About Land..." left="76"
-                     mouse_opaque="true" name="button about land" scale_image="TRUE" width="102" />
+                     height="20" label="Abandon Land..." label_selected="Abandon Land..."
+                     left="48" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
+                     width="112" />
         </panel>
         <string name="status_rotate">
                 Drag colored bands to rotate object