livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
MaksymS ProductEngine 2012-08-16 18:32:08 +03:00
parent 22561c0fc7 7f8f2d7f8a
commit a368d22d76
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llsidepanelappearance.cpp
View File

@ -456,10 +456,10 @@ void LLSidepanelAppearance::refreshCurrentOutfitName(const std::string& name)
void LLSidepanelAppearance::editWearable(LLWearable *wearable, LLView *data, BOOL disable_camera_switch)
{
LLFloaterSidePanelContainer::showPanel("appearance", LLSD());
LLSidepanelAppearance *panel = dynamic_cast<LLSidepanelAppearance*>(data);
if (panel)
{
panel->showOutfitsInventoryPanel();
panel->showWearableEditPanel(wearable, disable_camera_switch);
}
}

2
indra/newview/skins/default/xui/en/panel_media_settings_general.xml
View File

@ -30,7 +30,7 @@
(This page does not pass the specified whitelist)
</text>
<line_editor
max_length="1024"
max_length_bytes="1024"
bottom_delta="-24"
enabled="true"
follows="left|top"