diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-30 11:09:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-30 11:09:00 -0400 |
| commit | 71a468c6fb52f2f2cc7ebd17e548e9eaf3a875a5 (patch) | |
| tree | e2d49a6fe81f8fd9f0e8793112830d7b17d9068d /indra/newview/llviewermenu.cpp | |
| parent | f46526b16004e734d0a459e482ab9bb5df656c54 (diff) | |
| parent | 94744d4e5ec1bb8dfafa2c459ebc8fbf0b92a68a (diff) | |
merge changes for other open sourc contributions
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 3096d8c7ce..7e8bd9a4e0 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2831,6 +2831,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 |