diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-21 15:19:27 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-21 15:19:27 +0200 |
| commit | a28be8aa2dd1a1440724bd72fbabc896739719dd (patch) | |
| tree | 5d27c9e7e83423d3c14ba48802114b6e0a06a5ac /indra/newview/app_settings | |
| parent | 89449c3f389a20944a6161a22c3048a0cde2e7da (diff) | |
| parent | 6e74f825be5f03ddf958d0e0ace2998c90fcf65e (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8b66dcb2da..a4fc095727 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1145,17 +1145,6 @@ <key>Value</key> <integer>5</integer> </map> - <key>CallFloaterMaxItems</key> - <map> - <key>Comment</key> - <string>Max number of visible participants in voice controls window</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>5</integer> - </map> <key>CameraAngle</key> <map> <key>Comment</key> @@ -3629,7 +3618,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://int.searchwww-phx0.damballah.lindenlab.com/viewer/[CATEGORY]?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]</string> + <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]</string> </map> <key>HighResSnapshot</key> <map> |