aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorJay Threeth2011-04-04 21:19:56 -0700
committerJay Threeth2011-04-04 21:19:56 -0700
commit2ab66e34d799248e71db4b35ef45f28231183d7d (patch)
tree05108d807943eae7353486e5072f2c627fcbbd18 /linden/indra
parentadd source to libraries, and cruft for building under windows (diff)
downloadmeta-impy-2ab66e34d799248e71db4b35ef45f28231183d7d.zip
meta-impy-2ab66e34d799248e71db4b35ef45f28231183d7d.tar.gz
meta-impy-2ab66e34d799248e71db4b35ef45f28231183d7d.tar.bz2
meta-impy-2ab66e34d799248e71db4b35ef45f28231183d7d.tar.xz
Gui fix
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llimpanel.cpp1
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml4
2 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 75872e0..de57225 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1411,7 +1411,6 @@ BOOL LLFloaterIMPanel::postBuild()
1411 1411
1412#if USE_OTR // [$PLOTR$] 1412#if USE_OTR // [$PLOTR$]
1413 if (!gOTR) OTR_Wrapper::init(); 1413 if (!gOTR) OTR_Wrapper::init();
1414 llinfos << "$PLOTR$ gOTR is " << gOTR << llendl;
1415 if (gOTR && (IM_NOTHING_SPECIAL == mDialog)) 1414 if (gOTR && (IM_NOTHING_SPECIAL == mDialog))
1416 { 1415 {
1417 LLComboBox *combo = getChild<LLComboBox>("otr_combo"); 1416 LLComboBox *combo = getChild<LLComboBox>("otr_combo");
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 8e72c69..a31d090 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -185,8 +185,8 @@ To use spellcheck, right-click a misspelled word
185 <panel border="true" bottom="-580" follows="left|top|right|bottom" 185 <panel border="true" bottom="-580" follows="left|top|right|bottom"
186 height="525" label="OTR" 186 height="525" label="OTR"
187 left="1" mouse_opaque="true" name="OTR" width="418"> 187 left="1" mouse_opaque="true" name="OTR" width="418">
188 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" 188 <button bottom="-25" follows="left|top" font="SansSerifSmall"
189 height="18" right="470" 189 height="18" right="490"
190 name="otr_help_btn" width="98" label="What is OTR?"/> 190 name="otr_help_btn" width="98" label="What is OTR?"/>
191 <radio_group bottom="-120" draw_border="false" enabled="true" follows="left|top" 191 <radio_group bottom="-120" draw_border="false" enabled="true" follows="left|top"
192 height="80" 192 height="80"