Second Life viewer sources 1.20.2

1 files changed, 10 insertions, 5 deletions

diff --git a/linden/indra/newview/llfloatergesture.cpp b/linden/indra/newview/llfloatergesture.cpp
index addcf1d..e62a589 100644
--- a/linden/indra/newview/llfloatergesture.cpp
+++ b/linden/indra/newview/llfloatergesture.cpp
@@ -52,7 +52,7 @@
 #include "llscrollcontainer.h"
 #include "llscrolllistctrl.h"
 #include "lltextbox.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewergesture.h"
 #include "llviewerimagelist.h"
 #include "llviewerinventory.h"
@@ -99,7 +99,7 @@ LLFloaterGesture::~LLFloaterGesture()
 
         // Custom saving rectangle, since load must be done
         // after postBuild.
-        gSavedSettings.setRect("FloaterGestureRect", getRect());
+        gSavedSettings.setRect("FloaterGestureRect2", getRect());
 }
 
 // virtual
@@ -144,10 +144,10 @@ void LLFloaterGesture::show()
         LLFloaterGesture *self = new LLFloaterGesture();
 
         // Builds and adds to gFloaterView
-        gUICtrlFactory->buildFloater(self, "floater_gesture.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(self, "floater_gesture.xml");
 
         // Fix up rectangle
-        LLRect rect = gSavedSettings.getRect("FloaterGestureRect");
+        LLRect rect = gSavedSettings.getRect("FloaterGestureRect2");
         self->reshape(rect.getWidth(), rect.getHeight());
         self->setRect(rect);
 
@@ -156,7 +156,12 @@ void LLFloaterGesture::show()
         self->childSetFocus("gesture_list");
 
         LLCtrlListInterface *list = self->childGetListInterface("gesture_list");
-        if (list) list->selectFirstItem();
+        if (list)
+        {
+                const BOOL ascending = TRUE;
+                list->sortByColumn("name", ascending);
+                list->selectFirstItem();
+        }
         
         self->mSelectedID = LLUUID::null;