diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:58:17 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:58:17 +0000 |
| commit | 0aa2bc4831674e61edf680887eba9acec9f997ed (patch) | |
| tree | edf19fd9b857cf13b9e7ad943b65178954b4811c /indra/newview/llpanelplaces.cpp | |
| parent | 51500f82e23b7deff9a0e1bc23f5bfa40aec1fb9 (diff) | |
svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2
Bug Fixes:
* EXT-637 EXT-595
Dev work:
* EXT-694
QA:
* Be sure feature works on other locales
Known issues:
* If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts.
* It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy.
* If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
| -rw-r--r-- | indra/newview/llpanelplaces.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index ad1dd74cc6..7cb9e61e72 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -32,6 +32,7 @@ #include "llviewerprecompiledheaders.h" #include "llassettype.h" +#include "llwindow.h" #include "lllandmark.h" @@ -51,6 +52,7 @@ #include "llpanelteleporthistory.h" #include "llsidetray.h" #include "lltoggleablemenu.h" +#include "llviewerinventory.h" #include "llviewermenu.h" #include "llviewerparcelmgr.h" #include "llviewerregion.h" |