aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/newview/llpanelavatar.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index cd8db83..4f29f6c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,9 @@
12008-09-22 Jacek Antonelli <jacek.antonelli@gmail.com> 12008-09-22 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/newview/llpanelavatar.cpp (setOnlineStatus):
4 'Offer Teleport' button in avatar profile is now always enabled,
5 regardless of whether the other person is known to be online.
6
3 * linden/indra/newview/llimpanel.cpp: 7 * linden/indra/newview/llimpanel.cpp:
4 'Offer Teleport' button in IM panel is now always enabled, 8 'Offer Teleport' button in IM panel is now always enabled,
5 regardless of whether the other person is known to be online. 9 regardless of whether the other person is known to be online.
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 3314ec1..f6a8817 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1325,7 +1325,7 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
1325 } 1325 }
1326 else 1326 else
1327 { 1327 {
1328 childSetEnabled("Offer Teleport...", (online_status == ONLINE_STATUS_YES)); 1328 childSetEnabled("Offer Teleport...", TRUE);
1329 childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString()); 1329 childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
1330 } 1330 }
1331} 1331}