summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-01-16 14:53:23 -0800
committerMerov Linden <merov@lindenlab.com>2013-01-16 14:53:23 -0800
commitf43f51406b024ed2423e068114ae818bac5c6df5 (patch)
treea12a37380c62a7c84b7bfff704aba6f356b5ae57 /indra
parentfd0cae39f38673d69448e90971e2369e0b81c2fe (diff)
CHUI-683 : Default sort order for Blocked was wrong, unrecognized value was not tested.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/app_settings/settings.xml2
-rw-r--r--indra/newview/llpanelblockedlist.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 126df69519..fd4d1df894 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10215,7 +10215,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>2</integer>
+ <integer>0</integer>
</map>
<key>CallLogSortOrder</key>
<map>
diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp
index df1ccdd9fc..115114bb53 100644
--- a/indra/newview/llpanelblockedlist.cpp
+++ b/indra/newview/llpanelblockedlist.cpp
@@ -89,6 +89,9 @@ BOOL LLPanelBlockedList::postBuild()
case E_SORT_BY_TYPE:
mBlockedList->sortByType();
break;
+ default:
+ llwarns << "Unrecognized sort order for blocked list" << llendl;
+ break;
}
// Use the context menu of the Block list for the Block tab gear menu.