Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLChatBar can't betreated as a LLPanel and a LLLayoutPanel at the same time. Demoted to just an LLPanel (fixes issues with follow attribute).

Browse Source
This commit is contained in:
Shyotl
2013-06-22 17:27:09 -05:00
parent 3f1e67d9df
commit 67df523f10
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llchatbar.cpp
View File

@@ -111,7 +111,7 @@ private:
//
LLChatBar::LLChatBar()
: LLLayoutPanel(),
: LLPanel(),
mInputEditor(NULL),
mGestureLabelTimer(),
mLastSpecialChatChannel(0),

3
indra/newview/llchatbar.h
View File

@@ -46,8 +46,7 @@ class LLFrameTimer;
class LLChatBarGestureObserver;
class LLComboBox;
class LLChatBar
: public LLLayoutPanel
class LLChatBar : public LLPanel
{
public:
// constructor for inline chat-bars (e.g. hosted in chat history window)

2
indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel bottom="-1" default_tab_group="1" follows="left|bottom|right" height="25"
<panel bottom="0" default_tab_group="1" follows="left|bottom|right" height="25"
left="0" name="chat_bar" width="395">
<panel bottom="1" follows="left|right|bottom" height="23" left="0"
use_bounding_rect="true" width="397" bg_visible="false" border="false" border_visible="false">

11
indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
View File

@@ -42,10 +42,13 @@
label="Cancel TP" label_selected="Cancel TP" left="571" name="Cancel TP"
scale_image="true" tool_tip="Click here to cancel the current teleport process." width="102" />
</layout_panel>
<layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
min_height="24" mouse_opaque="false" name="chat_bar" user_resize="false"
use_bounding_rect="true" width="395" />
<layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
follows="left|right|bottom" left="0" min_height="24" mouse_opaque="false" name="chat_bar_layout_panel" user_resize="false"
use_bounding_rect="true" width="395" >
<panel name="chat_bar" filename="panel_chat_bar.xml" width="395" mouse_opaque="false"
bottom="0" default_tab_group="1" follows="left|bottom|right" height="25"
left="0"/>
</layout_panel>
</layout_stack>
</layout_panel>
<layout_panel auto_resize="false" bottom="0" left="0" min_width="96" mouse_opaque="false"

4
indra/newview/skins/default/xui/es/panel_overlaybar.xml
View File

@@ -12,7 +12,9 @@
<button label="Pararse" label_selected="Pararse" name="Stand Up" tool_tip="Pulsa aquí para pararte"/>
<button label="Cancelar TP" label_selected="Cancelar TP" name="Cancel TP" tool_tip="Pulsa aquí para cancerla el proceso de teleporte actual"/>
</layout_panel>
<layout_panel name="chat_bar"/>
<layout_panel name="chat_bar_layout_panel">
<panel name="chat_bar"/>
</layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="ao_remote_container">

4
indra/newview/skins/default/xui/fr/panel_overlaybar.xml
View File

@@ -15,7 +15,9 @@
tool_tip="Im en attente."
width="150" />
</layout_panel>
<layout_panel name="chat_bar"/>
<layout_panel name="chat_bar_layout_panel">
<panel name="chat_bar"/>
</layout_panel>
</layout_stack>
</layout_panel>
<layout_panel min_width="220" name="media_remote_container" width="220"/>