From 8a1c557cbffcc4608f0c3b2c69dedef69bb7f3f3 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 14 Jun 2012 17:09:14 -0700
Subject: [PATCH] Updating the slurl icon with Leo's design and toggling the
behavior to show on PF disabled regions.
---
indra/newview/lllocationinputctrl.cpp | 4 ++--
.../textures/icons/Pathfinding_Dynamic.png | Bin 683 -> 384 bytes
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index db7371d993c..0d8526d3f14 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -827,7 +827,7 @@ void LLLocationInputCtrl::refreshParcelIcons()
bool allow_scripts = vpm->allowAgentScripts(agent_region, current_parcel);
bool allow_damage = vpm->allowAgentDamage(agent_region, current_parcel);
bool see_avs = current_parcel->getSeeAVs();
- bool pathfinding_dynamic = gAgent.getRegion()->dynamicPathfindingEnabled();
+ bool pathfinding_dynamic_enabled = gAgent.getRegion()->dynamicPathfindingEnabled();
// Most icons are "block this ability"
mParcelIcon[VOICE_ICON]->setVisible( !allow_voice );
@@ -836,7 +836,7 @@ void LLLocationInputCtrl::refreshParcelIcons()
mParcelIcon[BUILD_ICON]->setVisible( !allow_build );
mParcelIcon[SCRIPTS_ICON]->setVisible( !allow_scripts );
mParcelIcon[DAMAGE_ICON]->setVisible( allow_damage );
- mParcelIcon[PATHFINDING_DYNAMIC_ICON]->setVisible( pathfinding_dynamic );
+ mParcelIcon[PATHFINDING_DYNAMIC_ICON]->setVisible( !pathfinding_dynamic_enabled );
mDamageText->setVisible(allow_damage);
mParcelIcon[SEE_AVATARS_ICON]->setVisible( !see_avs );
diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png
index 2c485aef0dd2dc566e4463ee15f8690c8aaa30e4..0622141848d674ff013842bc0554b25679f91c41 100644
GIT binary patch
literal 384
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g!!3-obe&3S^Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JioyeYLR^9L3mKJ)ii*jTCtt}cdSLCy#>RHOx$T~-_o?YK
z9~)ZSjEeX6_KuE@zU?2%$jB%yEv>4mYHMqolapg$U~sXr=IENWPu28Ru3TAPU(dtC
zBP1jQH1mw&%RN9!wj{_e_&*-N5ZU%T3#f3Kr;B4q#jTtRuf+}v2(UbebWu`K@_hgM
z-}%T{V!3Da_dPb?zQeO>YliU=^KNAgxyY<19fzbA7DhRlzi*qqR*mt(@3Ne!LC^h#
zr{DV`T<ot|`%d>RlTTZQ+22+l({nAU%M9gAO~PxACM&#KbUC16_hHw*x~k1z)-y6|
zZ#wBI+fy2UO<G;5ed4b9@+sRk&VOouu9C}uL6}QUri$M-0q8;oPgg&ebxsLQ0Fob`
A&j0`b
literal 683
zcmV;c0#yBpP)<h;3K|Lk000e1NJLTq000gE000dL0ssI27QV<R00007bV*G`2iyh=
z6(~9B+(T>t000SaNLh0L03N{r03N{s!)a7g00004XF*Lt006O%3;baP0006yNkl<Z
zc-jFk0?_>d`T6+-1O)&8|KaE4QcqCu>*_i-HUs|r&(hKM{Qdp^1eTVTMn*;h0|Nx-
z=jRX*5DE$lnU9eX{oQ3%6*4B+2?Y4uGzhc9^V8o2ARiz9|NsC0{sZ~)@~5q`_x1PM
z!<mb62RbAF3=IYh1^Xu-1xYsi1O^6(k*?zB_bVzN0bW;EzsAWL4e+CY6bldiq^<k1
z!}0a}1uY#0c3BS|8~BE%{jR|SB_=2WUu9wm1OiY#5FH8ss<Hl@xBKMw8TI!P$=M5a
zm*?~Q1zkuB2?Fug+1&yvEi4rg4>2VG`2z*A!tnY44ig0HC>s0!1@zhP4A9Z`9uWT^
zAr5waa{><!4>>nB2?qW5|N8U!{r>>~7#0XFFckm)`~Ls|`Sb+={{H*@`5_`60=Bia
z(ACu7=?4z~|1%>70sr{a=LD~`=l}Z}3IXsSE(7`g2khzj!Mnr*-PYIW>Ff6M^-4Sl
zAt4OX(CqT}3-$y54+ZXSOAbCS0lUoux5)bZ{R9KSy1UBH(b?SX3JL}}FZfJ37$O<^
zI41vOP!UEi`{D2jf1m2=`49vG_yPU;`t<hqr>3a3uc0y^=2}Az84v9N{RH;`3B%F@
zlBnu3LRwByRH>(=0sZ~`|NsB}{{E$@s)KuS76|(t6$l3k{^jWT=kWyq3K_DotRW#F
z{{H>~0RaI3008><`MtBY0s#&G4k!;NPDfyp_X{)n01<L*VId(O0s;aC1_ot15|QMe
R8Ib@0002ovPDHLkV1mC3Frfed
--
GitLab