aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolplacer.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/lltoolplacer.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/lltoolplacer.cpp')
-rw-r--r--linden/indra/newview/lltoolplacer.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index 594be6c..e246546 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -129,7 +129,7 @@ BOOL LLToolPlacer::placeObject(S32 x, S32 y, MASK mask)
129 // ...and go back to the default tool 129 // ...and go back to the default tool
130 if (added && !gSavedSettings.getBOOL("CreateToolKeepSelected")) 130 if (added && !gSavedSettings.getBOOL("CreateToolKeepSelected"))
131 { 131 {
132 gCurrentToolset->selectTool( gToolTranslate ); 132 gToolMgr->getCurrentToolset()->selectTool( gToolTranslate );
133 } 133 }
134 134
135 return added; 135 return added;
@@ -171,7 +171,6 @@ LLPCode LLToolPlacerPanel::sSphere = LL_PCODE_SPHERE;
171LLPCode LLToolPlacerPanel::sSphereHemi = LL_PCODE_SPHERE_HEMI; 171LLPCode LLToolPlacerPanel::sSphereHemi = LL_PCODE_SPHERE_HEMI;
172LLPCode LLToolPlacerPanel::sTree = LL_PCODE_LEGACY_TREE; 172LLPCode LLToolPlacerPanel::sTree = LL_PCODE_LEGACY_TREE;
173LLPCode LLToolPlacerPanel::sGrass = LL_PCODE_LEGACY_GRASS; 173LLPCode LLToolPlacerPanel::sGrass = LL_PCODE_LEGACY_GRASS;
174LLPCode LLToolPlacerPanel::sTreeNew = LL_PCODE_TREE_NEW;
175 174
176S32 LLToolPlacerPanel::sButtonsAdded = 0; 175S32 LLToolPlacerPanel::sButtonsAdded = 0;
177LLButton* LLToolPlacerPanel::sButtons[ TOOL_PLACER_NUM_BUTTONS ]; 176LLButton* LLToolPlacerPanel::sButtons[ TOOL_PLACER_NUM_BUTTONS ];