From 57be416ab7c9d93196231fb55de8ba563f3b29eb Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Fri, 2 Feb 2007 18:05:29 +0000
Subject: [PATCH] svn merge -r 57502:57551
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3 svn merge -r
57565:57604 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3
(skips 57565, a merge from release. being picky.)
Pick up fixes for:
* Offer Teleport in profiles
* Setting 'none' group
* agni_check_parcel_auctions exception (pushed live already)
---
indra/newview/English.lproj/InfoPlist.strings | 4 +-
indra/newview/Info-SecondLife.plist | 2 +-
indra/newview/llpanelavatar.cpp | 37 +++++++++----------
3 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 6ef64e4b4bd..66ce4155414 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.13.3.2";
-CFBundleGetInfoString = "Second Life version 1.13.3.2, Copyright 2004-2006 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.13.3.3";
+CFBundleGetInfoString = "Second Life version 1.13.3.3, Copyright 2004-2006 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 6e1de8bb078..13901656b5d 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.13.3.2</string>
+ <string>1.13.3.3</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 653dd636f90..dda28020cd5 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -1294,6 +1294,24 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
}
mPanelSecondLife->childSetVisible("online_yes", (online_status == ONLINE_STATUS_YES));
+
+ childSetVisible("Offer Teleport...",TRUE);
+ BOOL in_prelude = gAgent.inPrelude();
+ if(gAgent.isGodlike())
+ {
+ childSetEnabled("Offer Teleport...", TRUE);
+ childSetToolTip("Offer Teleport...", childGetValue("TeleportGod").asString());
+ }
+ else if (in_prelude)
+ {
+ childSetEnabled("Offer Teleport...",FALSE);
+ childSetToolTip("Offer Teleport...",childGetValue("TeleportPrelude").asString());
+ }
+ else
+ {
+ childSetEnabled("Offer Teleport...", (online_status == ONLINE_STATUS_YES));
+ childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
+ }
}
void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
@@ -1404,25 +1422,6 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
childSetVisible("Mute",TRUE);
childSetEnabled("Mute",FALSE);
- childSetVisible("Offer Teleport...",TRUE);
- BOOL in_prelude = gAgent.inPrelude();
- if(gAgent.isGodlike())
- {
- childSetEnabled("Offer Teleport...", TRUE);
- childSetToolTip("Offer Teleport...", childGetValue("TeleportGod").asString());
- }
- else if (in_prelude)
- {
- childSetEnabled("Offer Teleport...",FALSE);
- childSetToolTip("Offer Teleport...",childGetValue("TeleportPrelude").asString());
- }
- else
- {
- // Even if user might be offline, allow a teleport offer.
- BOOL maybe_online = (online_status != ONLINE_STATUS_NO);
- childSetEnabled("Offer Teleport...", maybe_online);
- childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
- }
childSetVisible("drop target",TRUE);
childSetEnabled("drop target",FALSE);
--
GitLab