Merge branch 'offer-teleport' into next

6 files changed, 46 insertions, 6 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1d8ea17..84ff38c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -8,8 +8,28 @@
         
         * Updated to SL source 1.21.2.
 
+
+2008-09-23  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llfloaterfriends.cpp:
+        'Offer Teleport' button in friends list is now enabled
+        even when the selected user(s) appear to be offline.
+        Mostly for consistency, but also to allow a work-around
+        for times when presence is flakey.
+
+
 2008-09-22  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/newview/llpanelavatar.cpp (setOnlineStatus):
+        'Offer Teleport' button in avatar profile is now always enabled,
+        regardless of whether the other person is known to be online.
+
+        * linden/indra/newview/llimpanel.cpp:
+        'Offer Teleport' button in IM panel is now always enabled,
+        regardless of whether the other person is known to be online.
+        Fixes crash introduced by VWR-2072 when IMing someone not on
+        your friends list, and makes the feature useful in more cases.
+
         * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
         Increased maximum settable transparency from 90% to 100%.
 
@@ -60,6 +80,15 @@
         * linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml:
         Ditto.
 
+2008-09-20  Paul Churchill  <pnolan@dsl.pipex.com>
+
+        * linden/indra/newview/llimpanel.cpp:
+        VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button.
+        * linden/indra/newview/llimpanel.h:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml:
+        Ditto.
+
 2008-09-19  Gigs Taggart  <gigstaggart@gmail.com>
 
         * linden/indra/newview/app_settings/settings.xml:
@@ -76,6 +105,9 @@
 
 2008-09-19  McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * linden/indra/newview/skins/default/xui/en-us/panel_groups.xml: 
+        VWR-8024: simplify group invites: invite to group from groups list.
+
         * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
         VWR-1363: Add "Return Object" to the Tools menu.
 
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index 8fdaa52..acdd5ce 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -325,14 +325,9 @@ void LLPanelFriends::refreshRightsChangeList()
                 {
                         if(!friend_status->isOnline())
                         {
-                                can_offer_teleport = false;
                                 selected_friends_online = false;
                         }
                 }
-                else // missing buddy info, don't allow any operations
-                {
-                        can_offer_teleport = false;
-                }
         }
         
         if (num_selected == 0)  // nothing selected
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index c2b54f3..d8683ab 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1247,6 +1247,7 @@ BOOL LLFloaterIMPanel::postBuild()
                 childSetAction("end_call_btn", onClickEndCall, this);
                 childSetAction("send_btn", onClickSend, this);
                 childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
+                childSetAction("offer_tp_btn", onClickOfferTeleport, this);
 
                 childSetAction("moderator_kick_speaker", onKickSpeaker, this);
                 //LLButton* close_btn = getChild<LLButton>("close_btn");
@@ -1396,6 +1397,7 @@ void LLFloaterIMPanel::draw()
                 childSetValue("mute_btn", LLMuteList::getInstance()->isMuted(mOtherParticipantUUID, LLMute::flagVoiceChat));
                 childSetVisible("mute_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive());
         }
+
         LLFloater::draw();
 }
 
@@ -1732,6 +1734,13 @@ void LLFloaterIMPanel::onTabClick(void* userdata)
         self->setInputFocus(TRUE);
 }
 
+// static
+void LLFloaterIMPanel::onClickOfferTeleport(void* userdata)
+{
+        LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
+
+        handle_lure(self->mOtherParticipantUUID);
+}
 
 // static
 void LLFloaterIMPanel::onClickProfile( void* userdata )
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index 974fc4d..5bac0bd 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -231,6 +231,7 @@ public:
 
         static void             onClickProfile( void* userdata );
         static void             onClickGroupInfo( void* userdata );
+        static void             onClickOfferTeleport( void* userdata );
         static void             onClickClose( void* userdata );
         static void             onClickStartCall( void* userdata );
         static void             onClickEndCall( void* userdata );
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 7b21a15..76dbd1f 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1318,7 +1318,7 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
         }
         else
         {
-                childSetEnabled("Offer Teleport...", (online_status == ONLINE_STATUS_YES));
+                childSetEnabled("Offer Teleport...", TRUE);
                 childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
         }
 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index cce06b5..c3058c4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -51,6 +51,9 @@
                      image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
                      name="mute_btn" tool_tip="Mute voice" width="25" />
         </panel>
+        <button bottom_delta="0" follows="right|top" font="SansSerif"
+             halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5"
+             mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
         <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
              bottom="30" embedded_items="false" enabled="false"
              follows="left|top|right|bottom" font="SansSerif" height="221" left="5"