livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
master
Josh Bell 2007-02-02 18:05:29 +00:00
parent 305c74d516
commit 57be416ab7
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/English.lproj/InfoPlist.strings
View File

@ -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.";

2
indra/newview/Info-SecondLife.plist
View File

@ -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>

37
indra/newview/llpanelavatar.cpp
View File

@ -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);