aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-09-26 23:03:39 -0500
committerJacek Antonelli2009-09-26 23:03:59 -0500
commit5d5e6d47d1ca47daefa8342ad060529ca0b64787 (patch)
tree1b0152d6d73abe4471dfaee99d226bf4be8e4205 /linden/indra/newview/llviewermenu.cpp
parentRemoved the multiple accounts tip from grid manager. (diff)
parentMerge remote branch 'mccabe/1.2.0-next' into next (diff)
downloadmeta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.zip
meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.gz
meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.bz2
meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.xz
Merge branch 'gridmanager' into next
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r--linden/indra/newview/llviewermenu.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index d5e4d20..0146f9e 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2329,7 +2329,6 @@ class LLObjectEnableExport : public view_listener_t
2329 { 2329 {
2330 if(gAgent.getID()!=node->mPermissions->getCreator()) 2330 if(gAgent.getID()!=node->mPermissions->getCreator())
2331 { 2331 {
2332 llwarns<<"Incorrect permission to export"<<llendl;
2333 return false; 2332 return false;
2334 } 2333 }
2335 return true; 2334 return true;