summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2014-09-24 12:03:35 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2014-09-24 12:03:35 +0300
commit2f08102780b1508563684b65a64e565caab7b143 (patch)
tree576ebe3da88dedd612d9490539c73b5c4f7b9ed3 /indra/newview/llviewermenu.cpp
parent4fc71be01ab6eceaf000174f232f7901b8447640 (diff)
MAINT-1885 FIXED Don't allow to sit while in Editing appearance mode.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rwxr-xr-xindra/newview/llviewermenu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 38aaff9279..3cc4858226 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3590,7 +3590,7 @@ class LLSelfSitDown : public view_listener_t
bool enable_sitdown_self()
{
- return isAgentAvatarValid() && !gAgentAvatarp->isSitting() && !gAgent.getFlying();
+ return isAgentAvatarValid() && !gAgentAvatarp->isSitting() && !gAgentAvatarp->isEditingAppearance() && !gAgent.getFlying();
}
class LLCheckPanelPeopleTab : public view_listener_t