diff options
author | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
commit | 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch) | |
tree | bcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/llpanelvolume.cpp | |
parent | Second Life viewer sources 1.13.3.2 (diff) | |
download | meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2 meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz |
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/newview/llpanelvolume.cpp')
-rw-r--r-- | linden/indra/newview/llpanelvolume.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llpanelvolume.cpp b/linden/indra/newview/llpanelvolume.cpp index afda5bd..3a8650d 100644 --- a/linden/indra/newview/llpanelvolume.cpp +++ b/linden/indra/newview/llpanelvolume.cpp | |||
@@ -136,11 +136,11 @@ LLPanelVolume::~LLPanelVolume() | |||
136 | 136 | ||
137 | void LLPanelVolume::getState( ) | 137 | void LLPanelVolume::getState( ) |
138 | { | 138 | { |
139 | LLViewerObject* objectp = gSelectMgr->getFirstRootObject(); | 139 | LLViewerObject* objectp = gSelectMgr->getSelection()->getFirstRootObject(); |
140 | LLViewerObject* root_objectp = objectp; | 140 | LLViewerObject* root_objectp = objectp; |
141 | if(!objectp) | 141 | if(!objectp) |
142 | { | 142 | { |
143 | objectp = gSelectMgr->getFirstObject(); | 143 | objectp = gSelectMgr->getSelection()->getFirstObject(); |
144 | // *FIX: shouldn't we just keep the child? | 144 | // *FIX: shouldn't we just keep the child? |
145 | if (objectp) | 145 | if (objectp) |
146 | { | 146 | { |
@@ -185,7 +185,7 @@ void LLPanelVolume::getState( ) | |||
185 | // BUG? Check for all objects being editable? | 185 | // BUG? Check for all objects being editable? |
186 | BOOL editable = root_objectp->permModify(); | 186 | BOOL editable = root_objectp->permModify(); |
187 | BOOL single_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME ) | 187 | BOOL single_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME ) |
188 | && gSelectMgr->getObjectCount() == 1; | 188 | && gSelectMgr->getSelection()->getObjectCount() == 1; |
189 | 189 | ||
190 | // Select Single Message | 190 | // Select Single Message |
191 | if (single_volume) | 191 | if (single_volume) |