aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelvolume.cpp
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-02-03 15:23:22 +1000
committerDavid Walter Seikel2014-02-03 15:23:22 +1000
commitd056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/newview/llpanelvolume.cpp
parentUpdating tree and volume LOD. These go to eleven. (diff)
parentFix up OTR prefs to not crash. (diff)
downloadmeta-impy-next.zip
meta-impy-next.tar.gz
meta-impy-next.tar.bz2
meta-impy-next.tar.xz
Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpanelvolume.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelvolume.cpp b/linden/indra/newview/llpanelvolume.cpp
index b87a233..00b80f0 100644
--- a/linden/indra/newview/llpanelvolume.cpp
+++ b/linden/indra/newview/llpanelvolume.cpp
@@ -181,10 +181,10 @@ void LLPanelVolume::getState( )
181 return; 181 return;
182 } 182 }
183 183
184 BOOL owners_identical;
185 LLUUID owner_id; 184 LLUUID owner_id;
186 std::string owner_name; 185 std::string owner_name;
187 owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name); 186 // This is still needed for the side effects, though the result is not.
187 LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
188 188
189 // BUG? Check for all objects being editable? 189 // BUG? Check for all objects being editable?
190 BOOL editable = root_objectp->permModify(); 190 BOOL editable = root_objectp->permModify();