From 24c908483cb1fdceeb222129c4f329969779d6ca Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Mon, 7 Feb 2011 20:03:45 -0500 Subject: STORM-969 / ER-493 - Viewer side of the work to add 'Rentals' as a land type to the parcel API --- indra/llinventory/llparcel.cpp | 2 ++ indra/llinventory/llparcel.h | 1 + indra/newview/skins/default/xui/en/floater_about_land.xml | 8 ++++++++ indra/newview/skins/default/xui/en/strings.xml | 1 + 4 files changed, 12 insertions(+) diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 488bd45d8f..d2409375e3 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -72,6 +72,7 @@ static const std::string PARCEL_CATEGORY_STRING[LLParcel::C_COUNT] = "shopping", "stage", "other", + "rental" }; static const std::string PARCEL_CATEGORY_UI_STRING[LLParcel::C_COUNT + 1] = { @@ -89,6 +90,7 @@ static const std::string PARCEL_CATEGORY_UI_STRING[LLParcel::C_COUNT + 1] = "Shopping", "Stage", "Other", + "Rental", "Any", // valid string for parcel searches }; diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index ae301af9f5..751e2deb84 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -165,6 +165,7 @@ public: C_SHOPPING, C_STAGE, C_OTHER, + C_RENTAL, C_COUNT, C_ANY = -1 // only useful in queries }; diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 3dd6c60095..24939024de 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1404,6 +1404,10 @@ Only large parcels can be listed in search. label="Shopping" name="item11" value="shopping" /> + + Shopping --> Stage Other + Rental Any You -- cgit v1.2.3 From 333a9b3f978d6b6485b1c760fd177bdcfea7d2fc Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 9 Feb 2011 10:52:12 -0500 Subject: STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has been used --- doc/contributions.txt | 1 + indra/test_apps/llplugintest/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 8765240caa..143a0f6dc0 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -390,6 +390,7 @@ Jonathan Yap STORM-869 VWR-17801 VWR-24347 + STORM-977 Kage Pixel VWR-11 Ken March diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt index b4043b0fd9..cf97135d88 100644 --- a/indra/test_apps/llplugintest/CMakeLists.txt +++ b/indra/test_apps/llplugintest/CMakeLists.txt @@ -1,5 +1,5 @@ # -*- cmake -*- - +if(LL_TESTS) project(llplugintest) include(00-Common) @@ -537,3 +537,4 @@ if(WINDOWS) endif(WINDOWS) ll_deploy_sharedlibs_command(llmediaplugintest) +endif(LL_TESTS) -- cgit v1.2.3 From 29b3207fe433497c60feff0b1f71b7fdb27412e1 Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Fri, 11 Feb 2011 01:27:01 +0100 Subject: OPEN-29 Error out if lldir_.h is included when building for a different platform As far as I know, there is no good reason to include e.g. indra/llvfs/lldir_win32.h while not building for a windows target, so be better prevent this to avoid hard to find errors. --- doc/contributions.txt | 1 + indra/llvfs/lldir_linux.h | 4 ++++ indra/llvfs/lldir_mac.h | 4 ++++ indra/llvfs/lldir_solaris.h | 4 ++++ indra/llvfs/lldir_win32.h | 4 ++++ 5 files changed, 17 insertions(+) diff --git a/doc/contributions.txt b/doc/contributions.txt index 516760aa5a..3330b9794f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -189,6 +189,7 @@ Blakar Ogre blino Nakamura VWR-17 Boroondas Gupte + OPEN-29 SNOW-278 SNOW-503 SNOW-510 diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h index 451e81ae93..c7cfe905f5 100644 --- a/indra/llvfs/lldir_linux.h +++ b/indra/llvfs/lldir_linux.h @@ -24,6 +24,10 @@ * $/LicenseInfo$ */ +#if !LL_LINUX +#error This header must not be included when compiling for any target other than Linux. Consider including lldir.h instead. +#endif // !LL_LINUX + #ifndef LL_LLDIR_LINUX_H #define LL_LLDIR_LINUX_H diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index 4eac3c3ae6..6bde458bf6 100644 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h @@ -24,6 +24,10 @@ * $/LicenseInfo$ */ +#if !LL_DARWIN +#error This header must not be included when compiling for any target other than Mac OS. Consider including lldir.h instead. +#endif // !LL_DARWIN + #ifndef LL_LLDIR_MAC_H #define LL_LLDIR_MAC_H diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h index 4a1794f539..b48752d362 100644 --- a/indra/llvfs/lldir_solaris.h +++ b/indra/llvfs/lldir_solaris.h @@ -24,6 +24,10 @@ * $/LicenseInfo$ */ +#if !LL_SOLARIS +#error This header must not be included when compiling for any target other than Solaris. Consider including lldir.h instead. +#endif // !LL_SOLARIS + #ifndef LL_LLDIR_SOLARIS_H #define LL_LLDIR_SOLARIS_H diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index 4c932c932c..1d0a692883 100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h @@ -24,6 +24,10 @@ * $/LicenseInfo$ */ +#if !LL_WINDOWS +#error This header must not be included when compiling for any target other than Windows. Consider including lldir.h instead. +#endif // !LL_WINDOWS + #ifndef LL_LLDIR_WIN32_H #define LL_LLDIR_WIN32_H -- cgit v1.2.3 From 627c7634398e03145f297e91a8e93c0bbba00e33 Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Fri, 11 Feb 2011 01:35:21 +0100 Subject: =?UTF-8?q?OPEN-29=20Cleanup:=20removed=20extra=20qualification=20?= =?UTF-8?q?=E2=80=98LLDir=5FWin32::=E2=80=99=20on=20member=20=E2=80=98getN?= =?UTF-8?q?extFileInDir=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before OPEN-29, when lldir_win32.h would have been included when building for Linux, GCC would error out with indra/llvfs/lldir_win32.h:50: error: extra qualification ‘LLDir_Win32::’ on member ‘getNextFileInDir’ which, although unintended, probably was a Good Thing (TM), as this would have aborted the build, so that the wrong include would be noticed. Now that we explicitly error out with a (hopefully) useful error message, this isn't needed anymore. --- indra/llvfs/lldir_win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index 1d0a692883..8a97a248dd 100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h @@ -51,7 +51,7 @@ public: /*virtual*/ std::string getLLPluginFilename(std::string base_name); private: - BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname); + BOOL getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname); void* mDirSearch_h; llutf16string mCurrentDir; -- cgit v1.2.3 From 1c931920af96e8ef4fd7f923b58f23b2bee869ee Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Fri, 11 Feb 2011 01:41:34 +0100 Subject: OPEN-29 Cleanup: removed superflous "public:" Not related, just a while-I'm-at-it thing. --- indra/llvfs/lldir_linux.h | 2 +- indra/llvfs/lldir_mac.h | 2 +- indra/llvfs/lldir_solaris.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h index c7cfe905f5..6015b25faa 100644 --- a/indra/llvfs/lldir_linux.h +++ b/indra/llvfs/lldir_linux.h @@ -44,7 +44,7 @@ public: /*virtual*/ void initAppDirs(const std::string &app_name, const std::string& app_read_only_data_dir); -public: + virtual std::string getCurPath(); virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask); virtual BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname); diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index 6bde458bf6..b456d3afca 100644 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h @@ -43,7 +43,7 @@ public: /*virtual*/ void initAppDirs(const std::string &app_name, const std::string& app_read_only_data_dir); -public: + virtual S32 deleteFilesInDir(const std::string &dirname, const std::string &mask); virtual std::string getCurPath(); virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask); diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h index b48752d362..5623254758 100644 --- a/indra/llvfs/lldir_solaris.h +++ b/indra/llvfs/lldir_solaris.h @@ -44,7 +44,7 @@ public: /*virtual*/ void initAppDirs(const std::string &app_name, const std::string& app_read_only_data_dir); -public: + virtual std::string getCurPath(); virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask); virtual BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname); -- cgit v1.2.3 From 1d0001020716d3f3d3734dd4a4f8cd609bc2b215 Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Fri, 11 Feb 2011 02:09:20 +0100 Subject: OPEN-29 Cleanup: strip trailing whitespace As people will have to rebuild half the tree anyway, because these headers changed, we might as well prettify them a bit. --- indra/llvfs/lldir_linux.h | 4 ++-- indra/llvfs/lldir_solaris.h | 2 +- indra/llvfs/lldir_win32.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h index 6015b25faa..a34de1241d 100644 --- a/indra/llvfs/lldir_linux.h +++ b/indra/llvfs/lldir_linux.h @@ -1,6 +1,6 @@ /** * @file lldir_linux.h - * @brief Definition of directory utilities class for linux + * @brief Definition of directory utilities class for linux * * $LicenseInfo:firstyear=2000&license=viewerlgpl$ * Second Life Viewer Source Code @@ -57,7 +57,7 @@ private: DIR *mDirp; int mCurrentDirIndex; int mCurrentDirCount; - std::string mCurrentDir; + std::string mCurrentDir; }; #endif // LL_LLDIR_LINUX_H diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h index 5623254758..70fac6f818 100644 --- a/indra/llvfs/lldir_solaris.h +++ b/indra/llvfs/lldir_solaris.h @@ -54,7 +54,7 @@ private: DIR *mDirp; int mCurrentDirIndex; int mCurrentDirCount; - std::string mCurrentDir; + std::string mCurrentDir; }; #endif // LL_LLDIR_SOLARIS_H diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index 8a97a248dd..b170ebbcd7 100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h @@ -52,7 +52,7 @@ public: private: BOOL getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname); - + void* mDirSearch_h; llutf16string mCurrentDir; }; -- cgit v1.2.3 From 96b4eef7f6a943025d90eb25e0e6fbb1c7878001 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Fri, 11 Feb 2011 22:55:10 +0200 Subject: STORM-991 FIXED parameter parsing warning upon Inventory floater construction. --- indra/newview/skins/default/xui/en/panel_main_inventory.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 96633cb5b4..0df9aa2868 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -46,7 +46,7 @@ label="Filter Inventory" layout="topleft" left="10" - max_length="300" + max_length_chars="300" name="inventory search editor" top="18" width="303" /> -- cgit v1.2.3 From 2bd790daaab9603dc61b8cd431b2e5d65f91ef79 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Sat, 12 Feb 2011 06:30:19 -0500 Subject: STORM-990 The arrow in the bottom right of the Landmark panel points down --- doc/contributions.txt | 1 + indra/newview/skins/default/xui/en/panel_places.xml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 516760aa5a..5aad56ba3b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -398,6 +398,7 @@ Jonathan Yap STORM-643 STORM-960 STORM-953 + STORM-990 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index d9c357f277..d907b5f7ec 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -214,7 +214,9 @@ background_visible="true" Date: Sat, 12 Feb 2011 06:50:01 -0500 Subject: STORM-990 Slight change to up-selected button --- indra/newview/skins/default/xui/en/panel_places.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index d907b5f7ec..e4074a56c2 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -216,7 +216,7 @@ background_visible="true" height="23" image_disabled="ComboButton_UpOff" image_unselected="ComboButton_UpOff" - image_selected="ComboButton_Up_On_Selected" + image_selected="ComboButton_UpSelected" layout="topleft" mouse_opaque="false" name="overflow_btn" -- cgit v1.2.3 From c7d3f9377920f675ffa7ac8b01a42b8ae0958016 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Mon, 14 Feb 2011 21:11:11 +0200 Subject: STORM-949 FIXED Actual usernames removed from XUI files. Actual usernames are replaced with "TestString PleaseIgnore" in EN locale with setting translate="false" flag for affected widgets. Translated phrases with actual usernames are removed from XUI files in other locales. --- indra/newview/skins/default/xui/da/floater_about_land.xml | 6 ------ .../default/xui/da/floater_inventory_item_properties.xml | 6 ------ indra/newview/skins/default/xui/da/floater_tools.xml | 6 ------ indra/newview/skins/default/xui/da/inspect_avatar.xml | 2 -- indra/newview/skins/default/xui/da/panel_edit_profile.xml | 4 ---- indra/newview/skins/default/xui/da/panel_profile_view.xml | 2 -- indra/newview/skins/default/xui/da/sidepanel_task_info.xml | 6 ------ indra/newview/skins/default/xui/de/floater_about_land.xml | 6 ------ .../default/xui/de/floater_inventory_item_properties.xml | 6 ------ indra/newview/skins/default/xui/de/floater_tools.xml | 6 ------ indra/newview/skins/default/xui/de/inspect_avatar.xml | 3 --- indra/newview/skins/default/xui/de/inspect_group.xml | 3 --- indra/newview/skins/default/xui/de/panel_activeim_row.xml | 6 ------ indra/newview/skins/default/xui/de/panel_chat_header.xml | 1 - indra/newview/skins/default/xui/de/panel_edit_profile.xml | 4 ---- indra/newview/skins/default/xui/de/panel_instant_message.xml | 1 - indra/newview/skins/default/xui/de/panel_profile_view.xml | 2 -- indra/newview/skins/default/xui/de/sidepanel_task_info.xml | 6 ------ indra/newview/skins/default/xui/en/floater_about_land.xml | 7 +++++-- .../default/xui/en/floater_inventory_item_properties.xml | 6 ++++-- indra/newview/skins/default/xui/en/floater_tools.xml | 6 ++++-- indra/newview/skins/default/xui/en/inspect_avatar.xml | 9 ++++++--- indra/newview/skins/default/xui/en/inspect_group.xml | 3 ++- indra/newview/skins/default/xui/en/panel_activeim_row.xml | 3 ++- indra/newview/skins/default/xui/en/panel_chat_header.xml | 3 ++- indra/newview/skins/default/xui/en/panel_edit_profile.xml | 12 ++++++++---- indra/newview/skins/default/xui/en/panel_instant_message.xml | 3 ++- indra/newview/skins/default/xui/en/panel_profile_view.xml | 6 ++++-- indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 6 ++++-- indra/newview/skins/default/xui/es/floater_about_land.xml | 6 ------ .../default/xui/es/floater_inventory_item_properties.xml | 6 ------ indra/newview/skins/default/xui/es/floater_tools.xml | 6 ------ indra/newview/skins/default/xui/es/inspect_avatar.xml | 2 -- indra/newview/skins/default/xui/es/panel_edit_profile.xml | 4 ---- indra/newview/skins/default/xui/es/panel_profile_view.xml | 2 -- indra/newview/skins/default/xui/es/sidepanel_task_info.xml | 6 ------ indra/newview/skins/default/xui/fr/floater_about_land.xml | 6 ------ .../default/xui/fr/floater_inventory_item_properties.xml | 6 ------ indra/newview/skins/default/xui/fr/floater_tools.xml | 6 ------ indra/newview/skins/default/xui/fr/inspect_avatar.xml | 3 --- indra/newview/skins/default/xui/fr/inspect_group.xml | 3 --- indra/newview/skins/default/xui/fr/panel_activeim_row.xml | 6 ------ indra/newview/skins/default/xui/fr/panel_chat_header.xml | 1 - indra/newview/skins/default/xui/fr/panel_edit_profile.xml | 4 ---- indra/newview/skins/default/xui/fr/panel_instant_message.xml | 1 - indra/newview/skins/default/xui/fr/panel_profile_view.xml | 2 -- indra/newview/skins/default/xui/fr/sidepanel_task_info.xml | 6 ------ indra/newview/skins/default/xui/it/floater_about_land.xml | 8 ++------ .../default/xui/it/floater_inventory_item_properties.xml | 6 ------ indra/newview/skins/default/xui/it/floater_tools.xml | 6 ------ indra/newview/skins/default/xui/it/panel_profile_view.xml | 1 - indra/newview/skins/default/xui/it/sidepanel_task_info.xml | 6 ------ indra/newview/skins/default/xui/ja/floater_about_land.xml | 6 ------ .../default/xui/ja/floater_inventory_item_properties.xml | 6 ------ indra/newview/skins/default/xui/ja/floater_tools.xml | 6 ------ indra/newview/skins/default/xui/ja/inspect_avatar.xml | 1 - indra/newview/skins/default/xui/ja/inspect_group.xml | 3 --- indra/newview/skins/default/xui/ja/panel_activeim_row.xml | 6 ------ indra/newview/skins/default/xui/ja/panel_chat_header.xml | 1 - indra/newview/skins/default/xui/ja/panel_instant_message.xml | 1 - indra/newview/skins/default/xui/ja/panel_profile_view.xml | 1 - indra/newview/skins/default/xui/ja/sidepanel_task_info.xml | 6 ------ indra/newview/skins/default/xui/nl/floater_about_land.xml | 4 +--- .../default/xui/nl/floater_inventory_item_properties.xml | 6 ------ indra/newview/skins/default/xui/nl/floater_tools.xml | 6 ------ indra/newview/skins/default/xui/pl/floater_about_land.xml | 6 ------ .../default/xui/pl/floater_inventory_item_properties.xml | 6 ------ indra/newview/skins/default/xui/pl/floater_tools.xml | 6 ------ indra/newview/skins/default/xui/pl/inspect_avatar.xml | 2 -- indra/newview/skins/default/xui/pl/panel_edit_profile.xml | 4 ---- indra/newview/skins/default/xui/pl/panel_profile_view.xml | 2 -- indra/newview/skins/default/xui/pl/sidepanel_task_info.xml | 6 ------ indra/newview/skins/default/xui/pt/floater_about_land.xml | 6 ------ .../default/xui/pt/floater_inventory_item_properties.xml | 6 ------ indra/newview/skins/default/xui/pt/floater_tools.xml | 6 ------ indra/newview/skins/default/xui/pt/inspect_avatar.xml | 2 -- indra/newview/skins/default/xui/pt/panel_edit_profile.xml | 4 ---- indra/newview/skins/default/xui/pt/panel_profile_view.xml | 2 -- indra/newview/skins/default/xui/pt/sidepanel_task_info.xml | 6 ------ 79 files changed, 46 insertions(+), 314 deletions(-) delete mode 100644 indra/newview/skins/default/xui/de/panel_activeim_row.xml delete mode 100644 indra/newview/skins/default/xui/fr/panel_activeim_row.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_activeim_row.xml diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml index a096a87928..e80d187335 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -87,15 +87,9 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel Ejer: - - Leyla Linden - Gruppe: - - Leyla Linden - + + + þ: [COUNT] + Date: Tue, 22 Feb 2011 18:46:00 +0200 Subject: STORM-28 FIXED Added the ability to send agent's own calling card to others. - Added creating own calling card for the user to be able to share it with other residents. - Moved calling cards synchronization with friends list to the viewer start up. Previously synchronized upon opening the Friends tab in People side panel. - Calling cards for non-friends are not removed upon calling cards synchronization with friends list. - Enabled "Share" menu item for calling cards in inventory. --- indra/newview/llfriendcard.cpp | 85 +++++++++++----------------------- indra/newview/llfriendcard.h | 13 ------ indra/newview/llinventoryfunctions.cpp | 3 -- indra/newview/llpanelpeople.cpp | 29 +++++++++--- 4 files changed, 49 insertions(+), 81 deletions(-) diff --git a/indra/newview/llfriendcard.cpp b/indra/newview/llfriendcard.cpp index e9f1e3bc22..70e789f490 100644 --- a/indra/newview/llfriendcard.cpp +++ b/indra/newview/llfriendcard.cpp @@ -28,6 +28,7 @@ #include "llfriendcard.h" +#include "llagent.h" #include "llavatarnamecache.h" #include "llinventory.h" #include "llinventoryfunctions.h" @@ -290,58 +291,6 @@ void LLFriendCardsManager::syncFriendCardsFolders() boost::bind(&LLFriendCardsManager::ensureFriendsFolderExists, this)); } -void LLFriendCardsManager::collectFriendsLists(folderid_buddies_map_t& folderBuddiesMap) const -{ - folderBuddiesMap.clear(); - - static bool syncronize_friends_folders = true; - if (syncronize_friends_folders) - { - // Checks whether "Friends" and "Friends/All" folders exist in "Calling Cards" folder, - // fetches their contents if needed and synchronizes it with buddies list. - // If the folders are not found they are created. - LLFriendCardsManager::instance().syncFriendCardsFolders(); - syncronize_friends_folders = false; - } - - - LLInventoryModel::cat_array_t* listFolders; - LLInventoryModel::item_array_t* items; - - // get folders in the Friend folder. Items should be NULL due to Cards should be in lists. - gInventory.getDirectDescendentsOf(findFriendFolderUUIDImpl(), listFolders, items); - - if (NULL == listFolders) - return; - - LLInventoryModel::cat_array_t::const_iterator itCats; // to iterate Friend Lists (categories) - LLInventoryModel::item_array_t::const_iterator itBuddy; // to iterate Buddies in each List - LLInventoryModel::cat_array_t* fakeCatsArg; - for (itCats = listFolders->begin(); itCats != listFolders->end(); ++itCats) - { - if (items) - items->clear(); - - // *HACK: Only Friends/All content will be shown for now - // *TODO: Remove this hack, implement sorting if it will be needded by spec. - if ((*itCats)->getUUID() != findFriendAllSubfolderUUIDImpl()) - continue; - - gInventory.getDirectDescendentsOf((*itCats)->getUUID(), fakeCatsArg, items); - - if (NULL == items) - continue; - - uuid_vec_t buddyUUIDs; - for (itBuddy = items->begin(); itBuddy != items->end(); ++itBuddy) - { - buddyUUIDs.push_back((*itBuddy)->getCreatorUUID()); - } - - folderBuddiesMap.insert(make_pair((*itCats)->getUUID(), buddyUUIDs)); - } -} - /************************************************************************/ /* Private Methods */ @@ -499,23 +448,43 @@ void LLFriendCardsManager::syncFriendsFolder() LLAvatarTracker::buddy_map_t all_buddies; LLAvatarTracker::instance().copyBuddyList(all_buddies); - // 1. Remove Friend Cards for non-friends + // 1. Check if own calling card exists LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; - gInventory.collectDescendents(findFriendAllSubfolderUUIDImpl(), cats, items, LLInventoryModel::EXCLUDE_TRASH); + LLUUID friends_all_folder_id = findFriendAllSubfolderUUIDImpl(); + gInventory.collectDescendents(friends_all_folder_id, cats, items, LLInventoryModel::EXCLUDE_TRASH); + bool own_callingcard_found = false; LLInventoryModel::item_array_t::const_iterator it; for (it = items.begin(); it != items.end(); ++it) { - lldebugs << "Check if buddy is in list: " << (*it)->getName() << " " << (*it)->getCreatorUUID() << llendl; - if (NULL == get_ptr_in_map(all_buddies, (*it)->getCreatorUUID())) + if ((*it)->getCreatorUUID() == gAgentID) { - lldebugs << "NONEXISTS, so remove it" << llendl; - removeFriendCardFromInventory((*it)->getCreatorUUID()); + own_callingcard_found = true; + break; } } + // Create own calling card if it was not found in Friends/All folder + if (!own_callingcard_found) + { + LLAvatarName av_name; + LLAvatarNameCache::get( gAgentID, &av_name ); + + create_inventory_item(gAgentID, + gAgent.getSessionID(), + friends_all_folder_id, + LLTransactionID::tnull, + av_name.getCompleteName(), + gAgentID.asString(), + LLAssetType::AT_CALLINGCARD, + LLInventoryType::IT_CALLINGCARD, + NOT_WEARABLE, + PERM_MOVE | PERM_TRANSFER, + NULL); + } + // 2. Add missing Friend Cards for friends LLAvatarTracker::buddy_map_t::const_iterator buddy_it = all_buddies.begin(); llinfos << "try to build friends, count: " << all_buddies.size() << llendl; diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h index b7f0bada14..48a9f70079 100644 --- a/indra/newview/llfriendcard.h +++ b/indra/newview/llfriendcard.h @@ -79,19 +79,6 @@ public: */ void syncFriendCardsFolders(); - /*! - * \brief - * Collects folders' IDs with the buddies' IDs in the Inventory Calling Card/Friends folder. - * - * \param folderBuddiesMap - * map into collected data will be put. It will be cleared before adding new data. - * - * Each item in the out map is a pair where first is an LLViewerInventoryCategory UUID, - * second is a vector with UUID of Avatars from this folder. - * - */ - void collectFriendsLists(folderid_buddies_map_t& folderBuddiesMap) const; - private: typedef boost::function callback_t; diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 61d0a150b7..ba9bea02b9 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -483,9 +483,6 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(const LLInventoryIte switch(item->getType()) { - case LLAssetType::AT_CALLINGCARD: - return false; - break; case LLAssetType::AT_OBJECT: case LLAssetType::AT_BODYPART: case LLAssetType::AT_CLOTHING: diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index b07a46a222..b52f33ec3b 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -384,6 +384,16 @@ private: { lldebugs << "Inventory changed: " << mask << llendl; + static bool synchronize_friends_folders = true; + if (synchronize_friends_folders) + { + // Checks whether "Friends" and "Friends/All" folders exist in "Calling Cards" folder, + // fetches their contents if needed and synchronizes it with buddies list. + // If the folders are not found they are created. + LLFriendCardsManager::instance().syncFriendCardsFolders(); + synchronize_friends_folders = false; + } + // *NOTE: deleting of InventoryItem is performed via moving to Trash. // That means LLInventoryObserver::STRUCTURE is present in MASK instead of LLInventoryObserver::REMOVE if ((CALLINGCARD_ADDED & mask) == CALLINGCARD_ADDED) @@ -750,18 +760,23 @@ void LLPanelPeople::updateFriendList() all_friendsp.clear(); online_friendsp.clear(); - LLFriendCardsManager::folderid_buddies_map_t listMap; + uuid_vec_t buddies_uuids; + LLAvatarTracker::buddy_map_t::const_iterator buddies_iter; + + // Fill the avatar list with friends UUIDs + for (buddies_iter = all_buddies.begin(); buddies_iter != all_buddies.end(); ++buddies_iter) + { + buddies_uuids.push_back(buddies_iter->first); + } - // *NOTE: For now collectFriendsLists returns data only for Friends/All folder. EXT-694. - LLFriendCardsManager::instance().collectFriendsLists(listMap); - if (listMap.size() > 0) + if (buddies_uuids.size() > 0) { - lldebugs << "Friends Cards were found, count: " << listMap.begin()->second.size() << llendl; - all_friendsp = listMap.begin()->second; + lldebugs << "Friends added to the list: " << buddies_uuids.size() << llendl; + all_friendsp = buddies_uuids; } else { - lldebugs << "Friends Cards were not found" << llendl; + lldebugs << "No friends found" << llendl; } LLAvatarTracker::buddy_map_t::const_iterator buddy_it = all_buddies.begin(); -- cgit v1.2.3 From c3ae16432811aec28ca2488b92e29d0ef05a2b54 Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Thu, 24 Feb 2011 16:27:12 +0200 Subject: STOMR-665 FIXED User is not able to view full name of Group's founder in the Group Profile - Made text box and its panel follow right --- indra/newview/skins/default/xui/en/panel_group_general.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 70b96ca5eb..38b680ba86 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -21,7 +21,7 @@ Hover your mouse over the options for more help. Date: Fri, 25 Feb 2011 23:19:18 +0200 Subject: STORM-1015 FIXED the ability to select an item from combo list if its name is not unique. Updating combo box label upon list item selection does not search the item by label but takes the label of currently selected item instead. --- indra/llui/llcombobox.cpp | 29 +++++++++++++++++++++++------ indra/llui/llcombobox.h | 3 +++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 8b6a73af56..6f9893b07a 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -316,7 +316,7 @@ void LLComboBox::setValue(const LLSD& value) LLScrollListItem* item = mList->getFirstSelected(); if (item) { - setLabel(getSelectedItemLabel()); + updateLabel(); } mLastSelectedIndex = mList->getFirstSelectedIndex(); } @@ -384,6 +384,23 @@ void LLComboBox::setLabel(const LLStringExplicit& name) } } +void LLComboBox::updateLabel() +{ + // Update the combo editor with the selected + // item label. + if (mTextEntry) + { + mTextEntry->setText(getSelectedItemLabel()); + mTextEntry->setTentative(FALSE); + } + + // If combo box doesn't allow text entry update + // the combo button label. + if (!mAllowTextEntry) + { + mButton->setLabel(getSelectedItemLabel()); + } +} BOOL LLComboBox::remove(const std::string& name) { @@ -701,13 +718,13 @@ void LLComboBox::onItemSelected(const LLSD& data) mLastSelectedIndex = getCurrentIndex(); if (mLastSelectedIndex != -1) { - setLabel(getSelectedItemLabel()); + updateLabel(); if (mAllowTextEntry) - { - gFocusMgr.setKeyboardFocus(mTextEntry); - mTextEntry->selectAll(); - } + { + gFocusMgr.setKeyboardFocus(mTextEntry); + mTextEntry->selectAll(); + } } // hiding the list reasserts the old value stored in the text editor/dropdown button hideList(); diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 74d64269bd..e9ef9d07e4 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -148,6 +148,9 @@ public: // This is probably a UI abuse. void setLabel(const LLStringExplicit& name); + // Updates the combobox label to match the selected list item. + void updateLabel(); + BOOL remove(const std::string& name); // remove item "name", return TRUE if found and removed BOOL setCurrentByIndex( S32 index ); -- cgit v1.2.3 From 3810a391d018f480487e8012654b9b75d3525ced Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Sat, 26 Feb 2011 17:26:34 +0200 Subject: STORM-494 FIXED Message Well window is undocked while opening Side bar - To calculate properly whether the dockable floater visible or not, it's needed to get root view as dockable floater's parent --- indra/llui/lldockcontrol.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index f6f5a0beb3..5ed2c27160 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -160,8 +160,10 @@ bool LLDockControl::isDockVisible() case TOP: { // check is dock inside parent rect + // assume that parent for all dockable flaoters + // is the root view LLRect dockParentRect = - mDockWidget->getParent()->calcScreenRect(); + mDockWidget->getRootView()->calcScreenRect(); if (dockRect.mRight <= dockParentRect.mLeft || dockRect.mLeft >= dockParentRect.mRight) { -- cgit v1.2.3 From 40a8fc4b46ab13433a27b6ce5818aacde900b905 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Mon, 28 Feb 2011 14:18:00 -0500 Subject: STORM-980 Fix additional issue with Wear button found by QA --- indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 26efe783f8..2ad2416179 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -127,9 +127,9 @@ label="Wear" layout="topleft" name="wear_btn" - left="0" + left="1" top="0" - width="147" /> + width="146" /> -- cgit v1.2.3 From 268f528ca11617301cba1a54ae0eb38a65716309 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 1 Mar 2011 15:45:43 -0800 Subject: Set the version to 2.5.1... Yeap! Back from 2.7.0 (not a misprint) --- indra/llcommon/llversionviewer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 7703132d90..5a134b5009 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -28,8 +28,8 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 2; -const S32 LL_VERSION_MINOR = 7; -const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_MINOR = 5; +const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; -- cgit v1.2.3 From 22198656b77a8bdfb4d6b1a560c64ab77eb5c38c Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 1 Mar 2011 15:46:03 -0800 Subject: Added tag 2.5.1-start for changeset 63a6aedfce78 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6eb0813d1b..8fa56c75b7 100644 --- a/.hgtags +++ b/.hgtags @@ -70,3 +70,4 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-34_2.5.0-beta3 b723921b5c711bd24dbe77dc76ef488b544dac78 2.5.0-release b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release 92e58e51776a4f8c29069b1a62ff21454d2085f0 2.6.0-start +63a6aedfce785a6c760377bf685b2dae616797d2 2.5.1-start -- cgit v1.2.3 From 8e74e29bc724bff2b95b4c6e6eb9cd2bb3567dae Mon Sep 17 00:00:00 2001 From: eli_linden Date: Wed, 2 Mar 2011 11:31:29 -0800 Subject: VWR-23494 FIX on behalf of Torban Troutman --- indra/newview/skins/default/xui/de/panel_group_invite.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml index 4e3a304609..5f323d80dd 100644 --- a/indra/newview/skins/default/xui/de/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml @@ -10,7 +10,7 @@ Einige der ausgewählten Einwohner sind bereits Gruppenmitglieder und haben aus diesem Grund keine Einladung erhalten. - Sie können mehrere Einwohner Ihre Gruppe einladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“. + Sie können mehrere Einwohner in Ihre Gruppe einladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“.