diff options
| author | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
| commit | 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 (patch) | |
| tree | e7c0b2e22d4719123fd688e49a16b76a084c3f77 /indra/newview/llpanelface.cpp | |
| parent | 12ac04231b8d358e70c830f7958f7efbc0f7c0d1 (diff) | |
merge -r 56779:58057 /branches/selection_management
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index d9ef9e4c13..cdcaed43f9 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -238,7 +238,8 @@ void LLPanelFace::sendTextureInfo() { S32 te; LLViewerObject* object; - for ( gSelectMgr->getFirstTE(&object, &te); object; gSelectMgr->getNextTE(&object, &te) ) + LLObjectSelectionHandle selection = gSelectMgr->getSelection(); + for ( selection->getFirstTE(&object, &te); object; selection->getNextTE(&object, &te) ) { BOOL valid; F32 value; @@ -317,7 +318,7 @@ void LLPanelFace::sendTextureInfo() } } - for ( object = gSelectMgr->getFirstObject(); object; object = gSelectMgr->getNextObject() ) + for ( object = gSelectMgr->getSelection()->getFirstObject(); object; object = gSelectMgr->getSelection()->getNextObject() ) { object->sendTEUpdate(); } @@ -325,7 +326,7 @@ void LLPanelFace::sendTextureInfo() void LLPanelFace::getState() { - LLViewerObject* objectp = gSelectMgr->getFirstObject(); + LLViewerObject* objectp = gSelectMgr->getSelection()->getFirstObject(); if( objectp && objectp->getPCode() == LL_PCODE_VOLUME) @@ -600,7 +601,7 @@ BOOL LLPanelFace::allFacesSameValue( F32 (get_face_value(LLViewerObject*, S32)), // Get the value from the primary selected TE F32 first_value = *value; BOOL got_first = FALSE; - gSelectMgr->getPrimaryTE(&object, &te); + gSelectMgr->getSelection()->getPrimaryTE(&object, &te); if (object) { first_value = get_face_value(object, te); @@ -609,7 +610,8 @@ BOOL LLPanelFace::allFacesSameValue( F32 (get_face_value(LLViewerObject*, S32)), // Now iterate through all TEs to test for sameness BOOL identical = TRUE; - for ( gSelectMgr->getFirstTE(&object, &te); object; gSelectMgr->getNextTE(&object, &te) ) + LLObjectSelectionHandle selection = gSelectMgr->getSelection(); + for ( selection->getFirstTE(&object, &te); object; selection->getNextTE(&object, &te) ) { if (!got_first) { @@ -760,13 +762,13 @@ void LLPanelFace::onCommitFullbright(LLUICtrl* ctrl, void* userdata) BOOL LLPanelFace::onDragTexture(LLUICtrl*, LLInventoryItem* item, void*) { BOOL accept = TRUE; - LLViewerObject* obj = gSelectMgr->getFirstRootObject(); + LLViewerObject* obj = gSelectMgr->getSelection()->getFirstRootObject(); while(accept && obj) { if(!LLToolDragAndDrop::isInventoryDropAcceptable(obj, item)) accept = FALSE; else - obj = gSelectMgr->getNextRootObject(); + obj = gSelectMgr->getSelection()->getNextRootObject(); } return accept; } @@ -823,7 +825,8 @@ void LLPanelFace::onClickAutoFix(void* userdata) LLViewerObject* object; // for all selected objects - for ( gSelectMgr->getFirstTE(&object, &te); object; gSelectMgr->getNextTE(&object, &te) ) + LLObjectSelectionHandle selection = gSelectMgr->getSelection(); + for ( selection->getFirstTE(&object, &te); object; selection->getNextTE(&object, &te) ) { // only do this if it's a media texture if ( object->getTE ( te )->getID() == LLMediaEngine::getInstance()->getImageUUID () ) @@ -848,7 +851,7 @@ void LLPanelFace::onClickAutoFix(void* userdata) }; // not clear why this is in a separate loop but i followed the patter from further up this file just in case. - for ( object = gSelectMgr->getFirstObject(); object; object = gSelectMgr->getNextObject() ) + for ( object = gSelectMgr->getSelection()->getFirstObject(); object; object = gSelectMgr->getSelection()->getNextObject() ) { object->sendTEUpdate(); }; |