diff options
| author | Cho <cho@lindenlab.com> | 2013-12-05 00:28:28 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-12-05 00:28:28 +0000 |
| commit | 9108354e9d39d93dadbad34ff5ba7ecb7abc7bf9 (patch) | |
| tree | 24f302d4d83a8c7195a2f1548e2160a14d8da7ba /indra/newview/app_settings | |
| parent | 187fb979d365ac3052f6a95e278a1f92c3117d17 (diff) | |
Renamed floater_social to floater_facebook for ACME-1205
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/commands.xml | 12 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/toolbars.xml | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index f4e9cc0136..7b329e2092 100755 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -216,15 +216,15 @@ is_running_function="Floater.IsOpen" is_running_parameters="snapshot" /> - <command name="social" + <command name="facebook" available_in_toybox="true" - icon="Command_Social_Icon" - label_ref="Command_Social_Label" - tooltip_ref="Command_Social_Tooltip" + icon="Command_Facebook_Icon" + label_ref="Command_Facebook_Label" + tooltip_ref="Command_Facebook_Tooltip" execute_function="Floater.ToggleOrBringToFront" - execute_parameters="social" + execute_parameters="facebook" is_running_function="Floater.IsOpen" - is_running_parameters="social" + is_running_parameters="facebook" /> <command name="flickr" available_in_toybox="true" diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 41aac583d7..0f60fc0210 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13108,7 +13108,7 @@ <key>SocialPhotoResolution</key> <map> <key>Comment</key> - <string>Default resolution when sharing photo using the social floater</string> + <string>Default resolution when sharing photo using the social floaters</string> <key>Persist</key> <integer>1</integer> <key>Type</key> diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml index c65b79affb..d61aee9a14 100755 --- a/indra/newview/app_settings/toolbars.xml +++ b/indra/newview/app_settings/toolbars.xml @@ -21,6 +21,6 @@ <command name="voice"/> <command name="minimap"/> <command name="snapshot"/> - <command name="social"/> + <command name="facebook"/> </left_toolbar> </toolbars> |