From e88c9909b627502db55aa85ba8b2947039818e60 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 18 Dec 2013 22:24:21 +0000
Subject: Added highlighting to SLShare tabs for ACME-1177
---
indra/newview/llfacebookconnect.cpp | 1 +
indra/newview/skins/default/xui/en/floater_facebook.xml | 3 ++-
indra/newview/skins/default/xui/en/floater_flickr.xml | 3 ++-
indra/newview/skins/default/xui/en/floater_twitter.xml | 3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
index eeb28376a9..77c67b1779 100644
--- a/indra/newview/llfacebookconnect.cpp
+++ b/indra/newview/llfacebookconnect.cpp
@@ -468,6 +468,7 @@ std::string LLFacebookConnect::getFacebookConnectURL(const std::string& route, b
LLViewerRegion *regionp = gAgent.getRegion();
if (regionp)
{
+ //url = "http://pdp15.lindenlab.com/facebook/agent/" + gAgentID.asString(); // TEMPORARY FOR TESTING - CHO
url = regionp->getCapability("FacebookConnect");
url += route;
diff --git a/indra/newview/skins/default/xui/en/floater_facebook.xml b/indra/newview/skins/default/xui/en/floater_facebook.xml
index 820e105e53..c1ff8571e9 100644
--- a/indra/newview/skins/default/xui/en/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/en/floater_facebook.xml
@@ -28,7 +28,8 @@
tab_position="top"
top="7"
height="437"
- halign="center">
+ halign="center"
+ use_highlighting_on_hover="true">
<panel
filename="panel_facebook_status.xml"
class="llfacebookstatuspanel"
diff --git a/indra/newview/skins/default/xui/en/floater_flickr.xml b/indra/newview/skins/default/xui/en/floater_flickr.xml
index 57014f8427..1a9ffd0489 100644
--- a/indra/newview/skins/default/xui/en/floater_flickr.xml
+++ b/indra/newview/skins/default/xui/en/floater_flickr.xml
@@ -28,7 +28,8 @@
tab_position="top"
top="7"
height="577"
- halign="center">
+ halign="center"
+ use_highlighting_on_hover="true">
<panel
filename="panel_flickr_photo.xml"
class="llflickrphotopanel"
diff --git a/indra/newview/skins/default/xui/en/floater_twitter.xml b/indra/newview/skins/default/xui/en/floater_twitter.xml
index 751914141c..aa5bfce2e9 100644
--- a/indra/newview/skins/default/xui/en/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/en/floater_twitter.xml
@@ -28,7 +28,8 @@
tab_position="top"
top="7"
height="457"
- halign="center">
+ halign="center"
+ use_highlighting_on_hover="true">
<panel
filename="panel_twitter_photo.xml"
class="lltwitterphotopanel"
--
cgit v1.2.3