diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
| commit | 9aee0cfa716736659af777c9fccd60b8618dc9d4 (patch) | |
| tree | bd6f329c88fc27fb697f6660d9eb51bcb14b9585 /indra/newview/llpanelpicks.cpp | |
| parent | cd9a2a6a4ab8d1d989110908a3702ba34d1f6168 (diff) | |
| parent | 65f8b95ae8e93c3b946e43eea89bcb631723ca6c (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/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")); + } } } |