diff options
Diffstat (limited to 'indra/newview')
4 files changed, 15 insertions, 28 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 952de00272..ef8f63484e 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -988,11 +988,10 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ } else { - std::string plugins_path = gDirUtilp->getLLPluginDir(); - plugins_path += gDirUtilp->getDirDelimiter(); - std::string launcher_name = gDirUtilp->getLLPluginLauncher(); std::string plugin_name = gDirUtilp->getLLPluginFilename(plugin_basename); + std::string user_data_path = gDirUtilp->getOSUserAppDir(); + user_data_path += gDirUtilp->getDirDelimiter(); // See if the plugin executable exists llstat s; @@ -1008,7 +1007,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ { LLPluginClassMedia* media_source = new LLPluginClassMedia(owner); media_source->setSize(default_width, default_height); - if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"))) + if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"), user_data_path)) { return media_source; } diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 812801abc9..9990215dfd 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -31,10 +31,8 @@ halign="center" layout="topleft" left_delta="-4" name="inventory filter tabs" - tab_min_width="70" tab_height="30" tab_position="top" - tab_height="30" tab_min_width="100" top_pad="4" width="305"> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index 102a53ad90..d8e3f4ccfb 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -348,23 +348,24 @@ label="Input/Output devices" layout="topleft" left="30" - top="270" + top="262" name="device_settings_btn" width="190"> </button> <panel - background_visible="true" + background_visible="false" bg_alpha_color="DkGray" visiblity_control="ShowDeviceSettings" border="false" follows="top|left" - height="145" + height="120" label="Device Settings" layout="topleft" left="0" name="device_settings_panel" class="panel_voice_device_settings" - width="501"> + width="501" + top="285"> <panel.string name="default_text"> Default @@ -397,7 +398,7 @@ left="165" max_chars="128" name="voice_input_device" - top_pad="0" + top_pad="-2" width="200" /> <text type="string" @@ -407,7 +408,7 @@ layout="topleft" left="165" name="My volume label" - top_pad="10" + top_pad="5" width="200"> My volume: </text> @@ -422,7 +423,7 @@ max_val="2" name="mic_volume_slider" tool_tip="Change the volume using this slider" - top_pad="0" + top_pad="-2" width="220" /> <text type="string" @@ -442,7 +443,7 @@ layout="topleft" left_delta="0" name="bar0" - top_delta="5" + top_delta="0" width="20" /> <locate height="20" @@ -472,16 +473,6 @@ name="bar4" top_delta="0" width="20" /> - <!-- <text - type="string" - height="37" - left="30" - name="voice_intro_text1" - top_pad="-4" - width="410" - word_wrap="true"> - Adjust the slider to control how loud you sound to other people. To test your volume, simply speak into your microphone - </text>--> <icon height="18" image_name="Parcel_Voice_Light" @@ -510,7 +501,7 @@ left="165" max_chars="128" name="voice_output_device" - top_pad="0" + top_pad="-2" width="200" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index c457dcb526..3dac1a9614 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -119,8 +119,8 @@ left="0" image_disabled="AddItem_Disabled" layout="topleft" left_pad="5" - name="add_btn" - tool_tip="Add new item" + name="newlook_btn" + tool_tip="Add new outfit" width="18" /> <dnd_button follows="bottom|left" @@ -150,7 +150,6 @@ left="0" layout="topleft" left_pad="5" right="-10" - name="newlook_btn" width="100" />--> <panel class="panel_look_info" |