diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:22:10 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:22:10 -0800 |
| commit | 890ec637d41330a2a91d23b09b6aaaf49738d19a (patch) | |
| tree | b093f98112fb0cfdcad5452df1b266f1e0052fc0 /indra/newview/llpanelpicks.cpp | |
| parent | 1d1e4c7abe5c46cfafbc351e8cad3197d2befefc (diff) | |
| parent | 4ab945c9f0000ead1eca22eefe0829bf3c15d7da (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
| -rw-r--r-- | indra/newview/llpanelpicks.cpp | 9 |
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")); + } } } |