diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-01 07:18:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-01 07:18:46 -0400 |
| commit | 6c9b45f4d6776e87cb1d70df0c456d29c3eb0ed7 (patch) | |
| tree | 601ec1552ccd724fda1180b8166f5331903d6127 | |
| parent | 17de5c7c46621603443fc531d8b4660e946ad098 (diff) | |
| parent | 6bc63bddeede375c6ea03c299b267559a3fca0fb (diff) | |
merge changes for new search
| -rw-r--r-- | BuildParams | 20 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 |
2 files changed, 5 insertions, 17 deletions
diff --git a/BuildParams b/BuildParams index 0a193803da..a064faf870 100644 --- a/BuildParams +++ b/BuildParams @@ -142,24 +142,12 @@ gooey.viewer_grid = agni gooey.build_viewer_update_version_manager = false # ======================================== -# Display Names project +# Search Project # ======================================== -#viewer-identity-evolution.email = leyla@lindenlab.com -viewer-identity.build_Debug = false -viewer-identity.build_RelWithDebInfo = false -viewer-identity.build_viewer = true -viewer-identity.build_server = false -viewer-identity.build_server_tests = false -viewer-identity.build_Linux = true -viewer-identity.build_hg_bundle = true -viewer-identity.bulld_docs = true -viewer-identity.viewer_channel = "Second Life Project Viewer" -viewer-identity.login_channel = "Second Life Project Viewer" -viewer-identity.viewer_grid = aditi -viewer-identity.build_viewer_update_version_manager = false - - +search_project-viewer.build_debug_release_separately = true +search_project-viewer.viewer_channel = "Second Life Project Viewer - Search" +search_project-viewer.login_channel = "Second Life Project Viewer - Search" # ======================================== # palange diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 78db307d64..c3c8a0b7b0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3980,7 +3980,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD]</string> + <string>http://search-beta.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD]</string> </map> <key>WebProfileURL</key> <map> |