aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-09-26 14:54:22 -0500
committerJacek Antonelli2009-09-26 14:54:22 -0500
commit031e12d8ecdfefebd8c236c5f4dc50fb8b82efae (patch)
tree9e520292d10d07295aa02d262703d59eb98c8b45
parentMerge remote branch 'mccabe/1.2.0-next' into next (diff)
downloadmeta-impy-031e12d8ecdfefebd8c236c5f4dc50fb8b82efae.zip
meta-impy-031e12d8ecdfefebd8c236c5f4dc50fb8b82efae.tar.gz
meta-impy-031e12d8ecdfefebd8c236c5f4dc50fb8b82efae.tar.bz2
meta-impy-031e12d8ecdfefebd8c236c5f4dc50fb8b82efae.tar.xz
Removed redundant warning about export perms.
-rw-r--r--ChangeLog.txt7
-rw-r--r--linden/indra/newview/llviewermenu.cpp1
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 30ab5fb..4327139 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
12009-09-26 Jacek Antonelli <jacek.antonelli@gmail.com>
2
3 * Removed redundant warning about export perms.
4
5 modified: linden/indra/newview/llviewermenu.cpp
6
7
12009-09-25 McCabe Maxsted <hakushakukun@gmail.com> 82009-09-25 McCabe Maxsted <hakushakukun@gmail.com>
2 9
3 * Removed problematic /MP flag. 10 * Removed problematic /MP flag.
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 8a92963..91caa72 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2324,7 +2324,6 @@ class LLObjectEnableExport : public view_listener_t
2324 { 2324 {
2325 if(gAgent.getID()!=node->mPermissions->getCreator()) 2325 if(gAgent.getID()!=node->mPermissions->getCreator())
2326 { 2326 {
2327 llwarns<<"Incorrect permission to export"<<llendl;
2328 return false; 2327 return false;
2329 } 2328 }
2330 return true; 2329 return true;