diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-01-06 11:05:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-01-06 11:05:55 -0500 |
| commit | 29ccfc46b5c29368c0437131f5ac6c719fa841b6 (patch) | |
| tree | a621d0faad6bb2923303910579d737d762e92a3f | |
| parent | 21c535635b955bf42713cfe726a51cdd49e8d53e (diff) | |
| parent | a6dfe5a64ef984aa1a3169c72b490983662f899f (diff) | |
merge changes for STORM-2098
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index f099b24084..dbe44d67af 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -326,6 +326,7 @@ Cinder Roxley STORM-2036 STORM-2037 STORM-2053 + STORM-2098 Clara Young Coaldust Numbers VWR-1095 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 |