summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-10-06 17:18:49 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-10-06 17:18:49 -0700
commit23205bb535e446979471296c9fa26f2530a9abaf (patch)
treebccbfbcc5926064a47951337f7f3fc3387abb4bc /indra/newview/app_settings
parentadeaf71e3314e44a33864dbe90d93040d4247c67 (diff)
EXP-1274 Create floater for "Avatar Picker" content
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/commands.xml4
-rw-r--r--indra/newview/app_settings/settings.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 1fff95417b..e4fc008b4c 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -26,9 +26,9 @@
label_ref="Command_Avatar_Label"
tooltip_ref="Command_Avatar_Tooltip"
execute_function="Floater.ToolbarToggle"
- execute_parameters="avatar_picker"
+ execute_parameters="avatar"
is_running_function="Floater.IsOpen"
- is_running_parameters="avatar_picker"
+ is_running_parameters="avatar"
/>
<command name="build"
available_in_toybox="true"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 203bcab03a..092e69952c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -619,7 +619,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string></string>
+ <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/avatars.html</string>
</map>
<key>AvatarBakedTextureUploadTimeout</key>
<map>