summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
AgeCommit message (Collapse)Author
2011-05-31adding inbox/outbox creation optionsLeyla Farazha
2011-04-22merge changes for storm-1187Oz Linden
2011-04-18EXP-628 Inventory floater may be opened by SLAppLeyla Farazha
EXP-630 My appearance floater may be opened by SLApp EXP-633 Search floater can be opened by SLApps
2011-04-12STORM-1145 ADDITIONAL FIX Fixed removing the record of user favorites ↵Seth ProductEngine
available at login location menu when user switches off this feature. User favorite locations record is removed from the settings file each time when user exits the viewer with "ShowFavoritesOnLogin" setting off and his name is found on the record.
2011-01-21merge out from viewer-developmentOz Linden
2011-01-13merge up to latest viewer-developmentOz Linden
2011-01-07Switch inventory capabilities to FetchInventory2 and family.Aaron Stone
2011-01-07merge changes for storm-34Oz Linden
2010-12-23STORM-34 ADDITIONAL_FIX Made saving favorites in file per-account preference ↵Andrew Productengine
instead of per-machine. - Made changes in code of floater preferences and panel login that were required because of turning the setting per-account. - Added new method to LLFloaterPreference that looks for current user's record in saved favorites file and removes it.
2010-12-09STORM-34 ADDITIONAL_FIX Implemented storing of multi-user favorites and ↵Andrew Productengine
showing them on login screen. - Changed the way SLURLs are cached a little, because previous one introduced problems with theit order. - Also allowed saving of favorites to disk even if not all of them received SLURL info - this is done to avoid favorites not saving when there is at least one "dead" landmark among them. - "Username" field on login screen is now not a lineeditor, but combobox (to enable autocompletion), but without button (Esbee asked for this in ticket for security reasons, and perhaps for visual consistency). - Elements of this combobox are names of users whose favorites we have saved in file. - Contents of "Start at:" combobox are changed depending on changes in "Username"- if username is present in favorites file, favorites for this user are added there. - New callback was added to LLCombobox and used in this fix, because present ones weren't enough to easily track changes in text entry.
2010-12-07merge viewer-development into web-profilesBrad Payne (Vir Linden)
2010-12-06STORM-34 FIXED Saving of user's favorites into file and showing them in ↵Andrew Productengine
"Start at" combobox on login screen was implemented. Implementation details: - File is saved on exit from viewer and not immediately on changes as was written in spec. It is done to make this file consistent with favorites order: order of favorites is saved on exit, so if favorites info is saved in other moment earlier, crashing viewer or other unexpected way of finishing its work (i.e. via Windows task bar) would cause inconsistence between favorites order saved per account and one from this new file. - File is saved in user_settings\stored_favorites.xml. - If you uncheck the option in Preferences and press OK, the file gets immediately deleted (according to spec). Issues that require further changes: - Currently only favorites of last logged in user are shown in login screen. Showing favorites of multiple users will be implemented later when design for it is approved by Esbee. - Preference is now global for all users, because design states it may be changed before login, and we don't have account info at the moment. But it doesn't seem to be a good idea, so changes in design are needed. - Currently the way of retrieving SLURLs needs optimization in a separate ticket. More detailed design approved by Esbee is needed to develop it further, perhaps in new tickets.
2010-12-04merge up to viewer-developmentOz Linden
2010-10-21Added support for map tracking slapp, share slapp and a voice call slapp.prep linden
slapp urls: secondlife:///app/maptrackavatar/lluid secondlife:///app/sharewithavatar/lluid secondlife:///app/voicecallavatar/lluid
2010-10-21secondlife:///app/maptrackavatar/lluidprep linden
secondlife:///app/sharewithavatar/lluid secondlife:///app/socialcallhandler/lluid <-work in progress
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-23Created new wearable type.Loren Shih
Added debug setting for disabling physics. Added disable-multiwear and disable-camera-reset to wearabletype.
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-04Merge with dessie/viewer-releaseLeyla Farazha
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
2010-07-30Merge with dessie/viewer-releaseLeyla Farazha
2010-07-30Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1Kent Quirk
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27Merge from dessie/viewer-releaseLeyla Farazha
2010-07-26merge from PE's viewer-releaseTofu Linden
2010-07-23EXT-8394 FIXED Added "New Note" to dictionary of predefined Inventory ↵Mike Antipov
items/folders. "New Note" should be translated on other languages in strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/795/ --HG-- branch : product-engine
2010-07-23automated mergeLoren Shih
2010-07-22EXT-8051 FIXED Change cameraCustomizeAvatar calls to use ↵Loren Shih
gAvatarp->isUsingBakedTextures Changed some uses of cameraCustomizeAvatar as appropriate.
2010-07-22EXT-8459 FIXED preventing crashes: 1) ensure that pointer to inventory item ↵Mike Antipov
is still valid when landmark is loaded from notecard and 2) adding a check for region capability There are two reasons of the crash reported in the bug: * absence of the "CopyInventoryFromNotecard" capability in region (which leads to crash while logging of a LL_ERRS) * referencing to an invalid pointer to LLInventoryItem in callback. The first issue is fixed by preventing sending of the "CopyInventoryFromNotecard" message if it is not supported (in the "copy_inventory_from_notecard()") The second issue caused by such reason: * Notecard stores LLPointer to each embedded inventory item * When Landmark is clicked it should be opened in Places Panel and inventory item should copied into agent inventory * If it is unknown to agent it is requested and pointer (but not LLPointer!) to inventory item was bound to an appropriate callback * Then when landmark is loaded that inventory item is copied to inventory. * If notecard was closed before callback was trigged all instances to embedded inventory items were destroyed. This leads to crash when trigged callback tries to reference to bound pointer to inventory item (for landmarks) Fix is to pass LLPointer instead of pointer to inventory item into callback to ensure item is valid when it is needed. Details: * updated LLEmbeddedItems::getEmbeddedItem() to return LLPointer to inventory item (and renamed to getEmbeddedItemPtr) * updated LLViewerTextEditor::openEmbeddedItem() to get LLPointer to inventory item * updated LLViewerTextEditor::openEmbeddedLandmark() to get LLPointer to inventory item Patch also contains some more places where pointer is replaced with LLPointer to be consistent. NOTE: there are several LLViewerTextEditor::openEmbeddedXXX() methods which still get pointer to inventory item. It is safe for now because they use it synchronously. I have added a note at their declaration. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/784/ --HG-- branch : product-engine
2010-07-27Merge from dessie/viewer-releaseRichard Linden
2010-07-19Merge with dessie/viewer-releaseLeyla Farazha
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-15EXT-8364 FIXED Added more predefined system strings to be translated into ↵Mike Antipov
dictionary. They are 4 from ticket and 3 more from library->gestures category: * "New Gesture" * "Female - Chuckle" * "Female - Cry" * "Female - Embarrassed" * "Female - Hey baby" * "Female - Looking good" * "Female - Over here" * "Female - Please" Also added missing string to be localized: "InvFolder Initial Outfits" They should be translated then. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/756/ --HG-- branch : product-engine
2010-07-14EXT-8319 FIXED Added method to localize inventory categories having ↵Mike Antipov
predefined names, updated predefined keys for "Male - Get lost" and "Female - Get lost". There were two issues: * "Male - Get lost" and "Female - Get lost" gestures have by 2 spaces before "-" in their names. * Folders were not processed to be localize. This was not implemented correctly in EXT-7051. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/753/ --HG-- branch : product-engine
2010-07-12mergeRichard Nelson
2010-07-08EXT-8238 FIX - unfortunately this won't have much impact on crash rates, ↵Brad Payne (Vir Linden)
since the problem occurs when we're already shutting down
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-06-25EXT-7991 FIX Crash if exit before outfit autopopulate completesRichard Nelson
reviewed by Leyla
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-17EXT-4919 WIP - populating new users with more gestures, and activating ↵Brad Payne (Vir Linden)
appropriate ones
2010-06-08EXT-7627 FIXED Wearing an item now doesn't open the wearable editing panel.Vadim Savchuk
Fix: - Save the UUID of a newly created wearable to start editing it right after it gets worn. This approach replaces a temporary hack that invoked the editing panel whenever an item gets worn (if the Appearance SP is opened at the time). The hack only happened to work sometimes because the editing panel failed to open. Other changes: - Removed a check for inventory item completeness from LLAgentWearables::editWearable(). because the check often fails and doesn't appear to be needed at all. - Added warning messages to LLAgentWearables::editWearable() so that it's easier to debug. - Replaced duplicated code in LLPanelOutfitEdit::onEditWearableClicked() with a call to gAgentWearables.editWearable(). Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/529/ --HG-- branch : product-engine
2010-06-03VWR-19699 WIP Correct operations for wear and replace on wearablesNyx (Neal Orman)
Resident-submitted patch, cleaned up so it matches style and compiles/builds well. Appears to work for stated goals but will need some more UI work to ensure consistency. WIP checkin, will be code reviewed before pushing.
2010-06-03mergeRichard Linden
2010-06-03mergeMike Antipov
--HG-- branch : product-engine
2010-06-03EXT-7503 WIP Made first inventory fetch for Add to Outfit panel on the first ↵Mike Antipov
openning, updated reliability of LLInventoryFetchItemsObserver * Moved initialization (with start fetch) of the LLFilteredWearableListManager into LLPanelOutfitEdit::onOpen * LLFilteredWearableListManager::changed now ignores non-related inventory changes (CALLING_CARD, GESTURE, SORT) Tried to fix an issue with empty Gesture list on startup with clean inventory cache. Reason: logic is based on count of "inventory changed" events. In case of there was too many requests requested items can be removed from queue by mistake. * Increased a number of the "change()" method calls to wait fetched items. Unfortunately this only works if My Inventory category does not have too many children. An does not work if it has 2000+ items Logic to remove item from the incompleted list should be based on timer and number of attempts. Also add some debug information about fetching inventory category and its content to log. Reviewed by Brad Payne at https://codereview.productengine.com/secondlife/r/456/ --HG-- branch : product-engine
2010-06-02EXT-6726 WIP Added more menus to the Appearance SP.Vadim Savchuk
Done: - Implemented creating new wearables via My Outfits gear menu. - Implemented renaming/removing/editing an outfit via My Outfits context menu. - Implemented "Attach to..." / "Attach to HUD..." context submenus. - Now disabling (instead of hiding) irrelevant wearable context menu items. - Added "Take Off / Detach" context menu item that's shown for clothes and attachments. Useful if you selected a bunch of items and want to take them all off. - Fixed taking off an outfit (not all wearables were taken off because of a wrong inventory collector). - Fixed crash when editing a skirt (reference to a missing string). - In LLWearableItemsList::ContextMenu::updateItemsVisibility renamed variables and introduced MASK_UNKNOWN per Nyx's request. Known issues: - "Attach to..." context menus may be displayed partially off-screen (there is the same bug in the inventory panel). - The way we invoke wearable editing panel after the wearable gets created is currently a hack. TODO: - Wear / take off / rename / delete an outfit via My Outfits gear menu (currently not implemented because of missing selection support in My Outfits). - Add "Create new..." to body part / clothing context menu in Edit Outfit. - Add "Create new..." submenus to the Edit Outfit gear menu. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/466/ --HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 18:46:04 +0000