diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-12 17:13:55 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-12 17:13:55 -0500 |
| commit | 2cabf100e22d4f54ebd0ea6ea20b88985a5654c4 (patch) | |
| tree | a410a41598caf63aeef39b2d0c40741ac372c10f /indra/newview/llfloatergesture.cpp | |
| parent | dce57c6b80b1286889da1a6cadda05c864a31851 (diff) | |
| parent | 21be0916a4b707654e99a8c6c734d24e4bb5da7c (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llfloatergesture.cpp')
| -rw-r--r-- | indra/newview/llfloatergesture.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp index 90617a337a..9c1ac2631d 100644 --- a/indra/newview/llfloatergesture.cpp +++ b/indra/newview/llfloatergesture.cpp @@ -203,12 +203,12 @@ BOOL LLFloaterGesture::postBuild() gInventory.addObserver(this); fetchDescendents(folders); - buildGestureList(); - - mGestureList->setFocus(TRUE); - if (mGestureList) { + buildGestureList(); + + mGestureList->setFocus(TRUE); + const BOOL ascending = TRUE; mGestureList->sortByColumn(std::string("name"), ascending); mGestureList->selectFirstItem(); @@ -223,10 +223,10 @@ BOOL LLFloaterGesture::postBuild() void LLFloaterGesture::refreshAll() { - buildGestureList(); - if (!mGestureList) return; + buildGestureList(); + if (mSelectedID.isNull()) { mGestureList->selectFirstItem(); |