From 0aa2bc4831674e61edf680887eba9acec9f997ed Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 28 Aug 2009 22:58:17 +0000 Subject: 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. --- indra/newview/llviewerwindow.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llviewerwindow.cpp') diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 9bdf9d2aac..461f7fc1c7 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -116,7 +116,6 @@ #include "llhudview.h" #include "llimagebmp.h" #include "llimagej2c.h" -#include "llfloaterinventory.h" #include "llkeyboard.h" #include "lllineeditor.h" #include "llmenugl.h" -- cgit v1.2.3