aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolindividual.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/lltoolindividual.cpp
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-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/lltoolindividual.cpp')
-rw-r--r--linden/indra/newview/lltoolindividual.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/lltoolindividual.cpp b/linden/indra/newview/lltoolindividual.cpp
index e17a2a1..96bd89e 100644
--- a/linden/indra/newview/lltoolindividual.cpp
+++ b/linden/indra/newview/lltoolindividual.cpp
@@ -85,7 +85,7 @@ void LLToolIndividual::pickCallback(S32 x, S32 y, MASK mask)
85 85
86BOOL LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask) 86BOOL LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
87{ 87{
88 if(!gSelectMgr->isEmpty()) 88 if(!gSelectMgr->getSelection()->isEmpty())
89 { 89 {
90 // You should already have an object selected from the mousedown. 90 // You should already have an object selected from the mousedown.
91 // If so, show its inventory. 91 // If so, show its inventory.
@@ -104,10 +104,10 @@ BOOL LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
104 104
105void LLToolIndividual::handleSelect() 105void LLToolIndividual::handleSelect()
106{ 106{
107 LLViewerObject* obj = gSelectMgr->getFirstRootObject(); 107 LLViewerObject* obj = gSelectMgr->getSelection()->getFirstRootObject();
108 if(!obj) 108 if(!obj)
109 { 109 {
110 obj = gSelectMgr->getFirstObject(); 110 obj = gSelectMgr->getSelection()->getFirstObject();
111 } 111 }
112 gSelectMgr->deselectAll(); 112 gSelectMgr->deselectAll();
113 if(obj) 113 if(obj)