summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCinder <cinder@sdf.org>2014-12-28 14:18:29 -0700
committerCinder <cinder@sdf.org>2014-12-28 14:18:29 -0700
commita6dfe5a64ef984aa1a3169c72b490983662f899f (patch)
tree3b9b883b8705325c696029d763786c3b15fc1d1e /indra/newview
parent4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff)
STORM-2098 - Don't enable object edit for an invalid agent
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewermenu.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 3abeba4b43..e190119bcd 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2830,6 +2830,8 @@ BOOL enable_object_build(void*)
bool enable_object_edit()
{
+ if (!isAgentAvatarValid()) return false;
+
// *HACK: The new "prelude" Help Islands have a build sandbox area,
// so users need the Edit and Create pie menu options when they are
// there. Eventually this needs to be replaced with code that only