From b637a183c41b091ea1c2e0a2f85987b7b5988afd Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 20 May 2010 16:15:22 -0700
Subject: DEV-50304 Busy mode response off bottom of preferences
---
indra/newview/llpanellogin.cpp | 2 +-
indra/newview/skins/default/xui/en/panel_preferences_general.xml | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 632c66a68c..feb36cf7dd 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -532,7 +532,7 @@ void LLPanelLogin::setFields(LLPointer<LLCredential> credential,
std::string login_id = firstname;
if (!lastname.empty() && lastname != "Resident")
{
- // support traditional First Last name slurls
+ // support traditional First Last name SLURLs
login_id += " ";
login_id += lastname;
}
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index eabbdc2186..c43784a6f8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -303,7 +303,7 @@
left_delta="0"
name="show_slids"
tool_tip="Show username, like bobsmith123"
- top_pad="5" />
+ top_pad="2" />
<text
type="string"
length="1"
@@ -324,6 +324,7 @@
layout="topleft"
left_pad="5"
name="title_afk_text"
+ top_delta="0"
width="190">
Away timeout:
</text>
@@ -394,7 +395,7 @@
hover="false"
commit_on_focus_lost = "true"
follows="left|top"
- height="60"
+ height="42"
layout="topleft"
left="50"
name="busy_response"
--
cgit v1.2.3