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/newview/skins/default/xui/en/floater_about_land.xml | 8 ++++++++ indra/newview/skins/default/xui/en/strings.xml | 1 + 2 files changed, 9 insertions(+) (limited to 'indra/newview') 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 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(-) (limited to 'indra/newview') 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 --- indra/newview/skins/default/xui/en/panel_places.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview') 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(-) (limited to 'indra/newview') 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 (limited to 'indra/newview') 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(-) (limited to 'indra/newview') 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(-) (limited to 'indra/newview') 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: 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(-) (limited to 'indra/newview') 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 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(-) (limited to 'indra/newview') 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“.