diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-06 20:01:40 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-06 20:01:40 -0700 |
| commit | 8919ef0ea442ae13076705d881b5e67cf8bed606 (patch) | |
| tree | e03fc77ea2b93565d01ebb494ec85f6624389650 /indra/newview/app_settings | |
| parent | ea02a6a80d52a030db71100856826eaff43ccce8 (diff) | |
| parent | 1bd5fd7edc9019f4ab4dfd1c4d25967f23d14401 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 8ee4b7d075..ae8471aa15 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> |