summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatergesture.cpp
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-03-04 16:59:57 +0000
committerJosh Bell <josh@lindenlab.com>2008-03-04 16:59:57 +0000
commita10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (patch)
tree051625f9ac6a0d08f613cf11da318c3fd30b06a9 /indra/newview/llfloatergesture.cpp
parent62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (diff)
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
Diffstat (limited to 'indra/newview/llfloatergesture.cpp')
-rw-r--r--indra/newview/llfloatergesture.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
index 44d158d2e3..171c7da0f9 100644
--- a/indra/newview/llfloatergesture.cpp
+++ b/indra/newview/llfloatergesture.cpp
@@ -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
@@ -147,7 +147,7 @@ void LLFloaterGesture::show()
gUICtrlFactory->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;