aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-04-09 12:54:23 +1000
committerDavid Walter Seikel2013-04-09 12:54:23 +1000
commit8ff6be96703388d4391ad1b62e45d21cf391cf38 (patch)
treea9efeb1e90ee8670e6c6a78c8198937194a97d72 /linden/indra
parentDelete unused structure. (diff)
downloadmeta-impy-8ff6be96703388d4391ad1b62e45d21cf391cf38.zip
meta-impy-8ff6be96703388d4391ad1b62e45d21cf391cf38.tar.gz
meta-impy-8ff6be96703388d4391ad1b62e45d21cf391cf38.tar.bz2
meta-impy-8ff6be96703388d4391ad1b62e45d21cf391cf38.tar.xz
Last of the unused variables goes bye.
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llpanelobject.cpp4
-rw-r--r--linden/indra/newview/llpanelvolume.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index cc89e24..bff365d 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -520,10 +520,10 @@ void LLPanelObject::getState( )
520 mBtnPasteRot->setEnabled( enable_rotate ); 520 mBtnPasteRot->setEnabled( enable_rotate );
521 mBtnPasteRotClip->setEnabled( enable_rotate ); 521 mBtnPasteRotClip->setEnabled( enable_rotate );
522 522
523 BOOL owners_identical;
524 LLUUID owner_id; 523 LLUUID owner_id;
525 std::string owner_name; 524 std::string owner_name;
526 owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name); 525 // This is still needed for the side effects, though the result is not.
526 LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
527 527
528 // BUG? Check for all objects being editable? 528 // BUG? Check for all objects being editable?
529 S32 roots_selected = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount(); 529 S32 roots_selected = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
diff --git a/linden/indra/newview/llpanelvolume.cpp b/linden/indra/newview/llpanelvolume.cpp
index 6d014a2..e4e30c0 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();