diff options
| -rw-r--r-- | BuildParams | 7 | ||||
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/BuildParams b/BuildParams index 90604af8c0..8e4164d5ca 100644 --- a/BuildParams +++ b/BuildParams @@ -14,6 +14,9 @@ public_build = true # Update Public Inworld Build Status Indicators email_status_this_is_os = true +# Limit extent of codeticket updates to revisions after... +codeticket_since = 2.2.0-release + # ======================================== # Viewer Development # ======================================== @@ -44,8 +47,8 @@ viewer-beta.login_channel = "Second Life Beta Viewer" viewer-beta.build_debug_release_separately = true viewer-beta.build_viewer_update_version_manager = true # Settings to test new code ticket service -#viewer-beta.codeticket_server_url = "http://pdp75.lindenlab.com:8000/codeticket/linden/" -#viewer-beta.codeticket_add_context = true +viewer-beta.codeticket_server_url = "http://pdp75.lindenlab.com:8000/codeticket/linden/" +viewer-beta.codeticket_add_context = true # ======================================== # Viewer Release diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 71c812efe2..9e9bc5fc1a 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -1367,9 +1367,6 @@ void LLPanelPeople::onMoreButtonClicked() void LLPanelPeople::onOpen(const LLSD& key) { std::string tab_name = key["people_panel_tab_name"]; - mFilterEditor -> clear(); - onFilterEdit(""); - if (!tab_name.empty()) mTabContainer->selectTabByName(tab_name); } |