Second Life viewer sources 1.14.0.0

1 files changed, 9 insertions, 7 deletions

diff --git a/linden/indra/newview/llfloatertelehub.cpp b/linden/indra/newview/llfloatertelehub.cpp
index 9fa614c..150e369 100644
--- a/linden/indra/newview/llfloatertelehub.cpp
+++ b/linden/indra/newview/llfloatertelehub.cpp
@@ -58,8 +58,8 @@ void LLFloaterTelehub::show()
         sInstance = new LLFloaterTelehub();
 
         // Show tools floater by selecting translate (select) tool
-        gCurrentToolset = gBasicToolset;
-        gCurrentToolset->selectTool( gToolTranslate );
+        gToolMgr->setCurrentToolset(gBasicToolset);
+        gToolMgr->getCurrentToolset()->selectTool( gToolTranslate );
 
         // Find tools floater, glue to bottom
         if (gFloaterTools)
@@ -101,6 +101,8 @@ LLFloaterTelehub::LLFloaterTelehub()
                 // otherwise you can't walk with arrow keys while floater is up
                 list->setAllowKeyboardMovement(FALSE);
         }
+
+        mObjectSelection = gSelectMgr->getEditSelection();
 }
 
 LLFloaterTelehub::~LLFloaterTelehub()
@@ -123,10 +125,10 @@ void LLFloaterTelehub::draw()
 // Per-frame updates, because we don't have a selection manager observer.
 void LLFloaterTelehub::refresh()
 {
-        LLViewerObject* object = gSelectMgr->getFirstRootObject();
+        LLViewerObject* object = mObjectSelection->getFirstRootObject();
         if(!object)
         {
-                object = gSelectMgr->getFirstObject();
+                object = mObjectSelection->getFirstObject();
         }
         
         BOOL have_selection = (object != NULL);
@@ -241,8 +243,8 @@ void LLFloaterTelehub::onClickRemoveSpawnPoint(void* data)
         msg->nextBlock("ParamList");
         msg->addString("Parameter", "spawnpoint remove");
 
-        char buffer[MAX_STRING];
-        sprintf(buffer, "%d", spawn_index);
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
+        snprintf(buffer, MAX_STRING, "%d", spawn_index);                /* Flawfinder: ignore */
         msg->nextBlock("ParamList");
         msg->addString("Parameter", buffer);
 
@@ -260,7 +262,7 @@ void LLFloaterTelehub::processTelehubInfo(LLMessageSystem* msg, void**)
 
 void LLFloaterTelehub::unpackTelehubInfo(LLMessageSystem* msg)
 {
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
 
         msg->getUUID("TelehubBlock", "ObjectID", mTelehubObjectID);
         msg->getString("TelehubBlock", "ObjectName", MAX_STRING, buffer);