diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-11 09:03:18 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-11 09:03:18 -0800 |
| commit | aab5759467a4d24aaebbdc95f052fbcb46826657 (patch) | |
| tree | 461fe115173ff85aa29233093c5334b4658a4000 /indra/newview/llviewermenu.cpp | |
| parent | 8e3c9b127373bb39c248ae7abf2003e684dbc6ba (diff) | |
| parent | c8457f266423370e6f8e84c1b23ef95ed69a2997 (diff) | |
STORM-807 : pull into viewer-development
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 9e16bf2fbb..60b118284b 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -557,7 +557,7 @@ class LLAdvancedCheckConsole : public view_listener_t new_value = get_visibility( (void*)gDebugView->mMemoryView ); } #endif - + return new_value; } }; @@ -4197,9 +4197,9 @@ class LLObjectEnableReturn : public view_listener_t { virtual bool apply(LLViewerObject* obj) { - return (obj->isOverAgentOwnedLand() || - obj->isOverGroupOwnedLand() || - obj->permModify()); + return + obj->permModify() || + obj->isReturnable(); } } func; const bool firstonly = true; |