Applied BlockClickSit debug setting from Emerald to block sit click action

3 files changed, 18 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f16be88..4d26242 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -9,6 +9,12 @@
          
                 modified:   linden/indra/newview/llvlcomposition.cpp
                 
+                
+     * Applied BlockClickSit debug setting from Emerald to block sit click action.
+         
+                modified:   linden/indra/newview/app_settings/settings.xml
+                modified:   linden/indra/newview/lltoolpie.cpp
+
          
 2009-09-13  McCabe Maxsted  <hakushakukun@gmail.com>
 
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 23602be..149eefa 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -664,6 +664,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>BlockClickSit</key>
+    <map>
+      <key>Comment</key>
+      <string>Block click sit</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>BrowserHome</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 921931b..b660b8d 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -182,7 +182,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                         // nothing
                         break;
                 case CLICK_ACTION_SIT:
-                        if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) // agent not already sitting
+                        if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting) && !gSavedSettings.getBOOL("BlockClickSit")) // agent not already sitting
                         {
                                 handle_sit_or_stand();
                                 return TRUE;