diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-14 11:47:03 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-14 11:47:03 -0700 |
| commit | 42fe654359646573f652438c7782d3f0a793b8ef (patch) | |
| tree | 37ed38316552004c7c957253de3fbba27cd25b27 /indra/newview/app_settings | |
| parent | aa7245fa2b5441285d2de384a9629782456af88a (diff) | |
| parent | 667c241177b9a23c305816fafb4feb81b0a93ba0 (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/toolbars.xml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 9d4d268075..3d3c13f5d8 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -111,7 +111,7 @@ is_running_parameters="world_map" /> <command name="marketplace" - available_in_toybox="true" + available_in_toybox="false" icon="Command_Marketplace_Icon" label_ref="Command_Marketplace_Label" tooltip_ref="Command_Marketplace_Tooltip" diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml index 8eb438b857..f2192a75ad 100644 --- a/indra/newview/app_settings/toolbars.xml +++ b/indra/newview/app_settings/toolbars.xml @@ -18,8 +18,7 @@ <command name="inventory"/> <command name="search"/> <command name="places"/> - <command name="marketplace"/> <command name="voice"/> <command name="minimap"/> </left_toolbar> -</toolbars>
\ No newline at end of file +</toolbars> |