diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 10:28:16 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 10:28:16 -0800 |
| commit | bf20d1498b38ad2a15bbe9b013eaca94c437b843 (patch) | |
| tree | 77548aa4a6737ee925c908b5b2d196c13b1301fc /indra/newview/llviewermenu.cpp | |
| parent | 375bdb6d1eb58e7f9f84be947d05ca44e550752d (diff) | |
| parent | 740bd8dbfd791bdd548064912abad8c0bf230f4c (diff) | |
merge
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 e18b4ec414..d2bbd6e4ed 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; |