diff options
| author | McCabe Maxsted | 2009-09-14 02:56:37 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-14 02:56:37 -0700 |
| commit | d24638496a96292807d06b2043e07cb9ae25389d (patch) | |
| tree | 762e9d3dd9ab9ad6bb288bf087dea3e030e85fe5 /linden/indra/newview/lltoolpie.cpp | |
| parent | Small performance change from Emerald viewer in LLVLComposition (diff) | |
| download | meta-impy-d24638496a96292807d06b2043e07cb9ae25389d.zip meta-impy-d24638496a96292807d06b2043e07cb9ae25389d.tar.gz meta-impy-d24638496a96292807d06b2043e07cb9ae25389d.tar.bz2 meta-impy-d24638496a96292807d06b2043e07cb9ae25389d.tar.xz | |
Applied BlockClickSit debug setting from Emerald to block sit click action
Diffstat (limited to 'linden/indra/newview/lltoolpie.cpp')
| -rw-r--r-- | linden/indra/newview/lltoolpie.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 182 | // nothing | 182 | // nothing |
| 183 | break; | 183 | break; |
| 184 | case CLICK_ACTION_SIT: | 184 | case CLICK_ACTION_SIT: |
| 185 | if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) // agent not already sitting | 185 | if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting) && !gSavedSettings.getBOOL("BlockClickSit")) // agent not already sitting |
| 186 | { | 186 | { |
| 187 | handle_sit_or_stand(); | 187 | handle_sit_or_stand(); |
| 188 | return TRUE; | 188 | return TRUE; |