aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelobject.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/llpanelobject.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/llpanelobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 36c479a..5d156f8 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();