aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llfloatermap.cpp2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index f4c8c96..7fe6fab 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -8,6 +8,11 @@
8 modified: linden/indra/newview/llpanelpermissions.cpp 8 modified: linden/indra/newview/llpanelpermissions.cpp
9 modified: linden/indra/newview/llwindlightremotectrl.cpp 9 modified: linden/indra/newview/llwindlightremotectrl.cpp
10 10
11
12 * Fixed Add button being enabled for friends in the radar.
13
14 modified: linden/indra/newview/llfloatermap.cpp
15
11 16
122009-09-22 McCabe Maxsted <hakushakukun@gmail.com> 172009-09-22 McCabe Maxsted <hakushakukun@gmail.com>
13 18
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index f7f51fd..6d23ab4 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -297,12 +297,14 @@ void LLFloaterMap::toggleButtons()
297 BOOL enable_unmute = FALSE; 297 BOOL enable_unmute = FALSE;
298 BOOL enable_track = FALSE; 298 BOOL enable_track = FALSE;
299 BOOL enable_estate = FALSE; 299 BOOL enable_estate = FALSE;
300 BOOL enable_friend = FALSE;
300 if (childHasFocus("RadarPanel")) 301 if (childHasFocus("RadarPanel"))
301 { 302 {
302 enable = mSelectedAvatar.notNull() ? visibleItemsSelected() : FALSE; 303 enable = mSelectedAvatar.notNull() ? visibleItemsSelected() : FALSE;
303 enable_unmute = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE; 304 enable_unmute = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE;
304 enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar); 305 enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
305 enable_estate = getKickable(mSelectedAvatar); 306 enable_estate = getKickable(mSelectedAvatar);
307 enable_friend = !is_agent_friend(mSelectedAvatar);
306 } 308 }
307 else 309 else
308 { 310 {