summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpicks.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-18 18:12:58 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-18 18:12:58 +0000
commit1c67e8f386d69e06c1ff820eb551b3c69592ff89 (patch)
tree6e3d565e5f5c1bbe4d974f0c9a4dc5e1af607692 /indra/newview/llpanelpicks.cpp
parent675b15948c5169ce07dec83a0f730e6a5b9d57d8 (diff)
parent7f432e085809a354ce0599c53c8f1f1eec52e18e (diff)
viewer2 merge.
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
-rw-r--r--indra/newview/llpanelpicks.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 8eb0b69491..2ff2597f08 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -351,7 +351,14 @@ void LLPanelPicks::processProperties(void* data, EAvatarProcessorType type)
if (mNoPicks && mNoClassifieds)
{
- childSetValue("picks_panel_text", LLTrans::getString("NoPicksClassifiedsText"));
+ if(getAvatarId() == gAgentID)
+ {
+ childSetValue("picks_panel_text", LLTrans::getString("NoPicksClassifiedsText"));
+ }
+ else
+ {
+ childSetValue("picks_panel_text", LLTrans::getString("NoAvatarPicksClassifiedsText"));
+ }
}
}