diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-08-13 14:01:51 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-13 14:01:51 -0700 |
commit | 1dd490ff88e7ee54b689e01529ffb88a3fc7491b (patch) | |
tree | 487ab551a0fc567bd94672c4a7e06625cc8b99ec /indra/newview/llfloaterpreference.cpp | |
parent | 7f085551431aa912a4a2be28e2b714d12f723809 (diff) | |
parent | 4ef75f35c195a4e2657a0e01d6b92cd40e6779f5 (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r-- | indra/newview/llfloaterpreference.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 7791c037d3..a4b45e04f2 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -826,13 +826,11 @@ void LLFloaterPreference::buildPopupLists() row["columns"][1]["font"] = "SANSSERIF_SMALL"; row["columns"][1]["width"] = 360; } - item = disabled_popups.addElement(row, - ADD_SORTED); + item = disabled_popups.addElement(row); } else { - item = enabled_popups.addElement(row, - ADD_SORTED); + item = enabled_popups.addElement(row); } if (item) |