summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-05-21Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-21EXT-7209 EXT-7366 FIX avatar needs to enter "appearance editing" modeNyx (Neal Orman)
Avatar now enters "appearance editing" mode when opening the outfit or wearable editors in the sidepanel. Changed code to ensure we don't accidentally switch out of it and back in when switching from one to the other. Note that this cuts out LLFLoaterCustomize from being built and shown to the user from any UI. The code for this (and related classes) will be removed once we have pulled any code out of it that we still need. The current outfit and wearable editors should be working sufficiently for most purposes. Bugs should be reported to Nyx Linden or the avatar team. Code reviewed by Vir
2010-05-21merge from PE's viewer-trunkTofu Linden
2010-05-20EXT-7288 WIP IT remove some overridesEli Linden
2010-05-20EXT-7287 FIX IT remove overrideEli Linden
2010-05-20automated mergeRoxie Linden
2010-05-20EXT-7223 FIXED (Add \"Shop\" Button in bottom of Inventory panel)Andrew Polunin
- Added 'MarketplaceURL' setting in settings.xml to represent URL which points to the Marketplace. - Added member mShopBtn in the class LLSidepanelInventory. - Added handler LLSidepanelInventory::onShopButtonClicked() which handles a click on the 'Shop' button - Added corresponding widget in the sidepanel_inventory.xml Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/408/ --HG-- branch : product-engine
2010-05-20EXT-5666 FIXED Changed clicked attachment color.Sergei Litovchuk
--HG-- branch : product-engine
2010-05-20EXT-7371 FIXED Improved new state handling in p2p Voice channel to process ↵Mike Antipov
session leave event correctly. Reason: * when user leave a p2p voice session himself the session's voice channel is marked as "ignore next leave session event" * but when he re-starts the voice session the channel stays in "ignore next leave session event" state. So, when an other p2p participant ends call this voice channel is not deactivated because of this flag. Fix: reset "ignore next leave session event" flag to FALSE when viewer is joining p2p voice session. Reviewed by Aimee Walton at https://codereview.productengine.com/secondlife/r/418/ --HG-- branch : product-engine
2010-05-20mergeYuri Chebotarev
--HG-- branch : product-engine
2010-05-20ext-7403 fix - reset all data before setting new group idYuri Chebotarev
reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/419/ --HG-- branch : product-engine
2010-05-20EXT-6598 FIX Handle tooltip message for separatorYuri Chebotarev
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/417/ --HG-- branch : product-engine
2010-05-20EXT-7104 WIP Enable Build button and set necessary callbacks.Mike Antipov
Because it is not enough to call showInstance for Build Floater it was implemented in a such way: * set save_visibility==true in floater tools to update button toggle state properly and subscribe Build button to listen visibility changes * added callback to observe parcel changing to set build button enabled/disabled. KNOWN ISSUE: if build permissions are changed button will not change state until restart/teleport Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/413/ --HG-- branch : product-engine
2010-05-20EXT-7363 FIXED Provided passing owner ID through chat object since it is ↵Alexei Arabadji
necessary to correctly build objectim SLURL when chat history reloads content. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/420/ --HG-- branch : product-engine
2010-05-20EXT-7391 FIXED Removed redundant responder functor setting that cause assertion.Alexei Arabadji
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/409/ --HG-- branch : product-engine
2010-05-20kill dos line-ending.Tofu Linden
2010-05-20EXT-7405 FIXED Changed "left" to "right" in text of tooltip.Andrew Dyukov
Trivial fix, so not reviewed. --HG-- branch : product-engine
2010-05-20EXT-7200 FIXED Integrated art missing from appearance.Andrew Dyukov
Most changes are in xml, but changing of view buttons overlay icons in lists from add wearables is implemented in code. Dragbar icon was only added as file, it will be integrated in EXT-7255 (There is no dragbar between 'Edit Outfit' and 'Add to Outfit:' panels). Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/410/ --HG-- branch : product-engine
2010-05-20Manual merge from default branch.Vadim Savchuk
Auto-resolved conflicts in: - indra/newview/llpaneleditwearable.cpp - indra/newview/llviewermenu.cpp - indra/newview/llviewerwindow.cpp - indra/newview/skins/default/xui/en/notifications.xml --HG-- branch : product-engine
2010-05-20merge from PE's viewer-trunkTofu Linden
2010-05-20SNOW-207/DEV-42245 : FIXED : Texture loading on sculpty plants is failing ↵Tofu Linden
making content appear to be of poor quality. Patch by Thickbrick, reviewed by me.
2010-05-20EXT-7367 FIX - eat sroll wheel above gesture popup listYuri Chebotarev
reviwed by Mike Antipov at https://codereview.productengine.com/secondlife/r/411 --HG-- branch : product-engine
2010-05-20EXT-7051 additional fix - add more hardcoded words to translated dictionaryYuri Chebotarev
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/414/ --HG-- branch : product-engine
2010-05-20automated mergeRoxie Linden
2010-05-20EXT-6734 - Unable to run several copies of viewerRoxie Linden
On startup, a piece of code in llappviewer.cpp checks for the existence and validity of a slurl entered on the command line. If there is a slurl, then the slurl is sent to another instance of the viewer if one is running (for windows and linux only.) After the SLE refactor of slurls, the startup slurl was set to LAST by default. As this is a valid slurl the call to pass the slurl to another viewer was made, ignoring the codepath that checks for multiple viewer launches. The fix defaults the startup slurl to INVALID. Now, when no slurl is passed in on the command line, the code that sends the slurl to another instance is skipped and the 'multiple' flag is checked appropriately.
2010-05-19EXT-7388 - --grid command line argument doesn't do anything.Roxie Linden
Grid selection code was looking up the grid by grid host id not grid label. As SLE grids use their dns name as their lable, it worked there. However, the beta grids use a short label.
2010-05-19mergeRichard Nelson
2010-05-19automated mergeRoxie Linden
2010-05-19EXT-6534 FIXED Snapshot to Disk ... causes snapshot of the active window ↵Richard Nelson
with a background to the correct size but the window the same size as original
2010-05-19automated mergeRoxie Linden
2010-05-19automated merge with viewer-publicNyx Linden
2010-05-19AVP-44 WIP Back-end support for multiwearablesNyx Linden
Changed a lot of areas of code that were not dealing with multiwearables properly. Little functionality changed, as the support mechanisms that were out of date were subtle, but getting closer to no further areas of code that don't properly support multi-wearables. Code reviewed by Vir.
2010-05-19mergeRichard Nelson
2010-05-19EXT-6364 - Ctrl-Alt-F1 doesn't currently hide all the viewer UIRichard Nelson
reviewed by leyla
2010-05-19The certificate hostname verification was not taking into account changes inRoxie Linden
hostname due to a redirect which is handled via curl. I turned off the secapi hostname verification just allowing libcurls hostname verification, as it's better anyway (it handles alt names)
2010-05-19automated mergeRoxie Linden
2010-05-19AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statisticsLoren Shih
Fix for scoping error leading to compile error.
2010-05-19automated mergeRoxie Linden
2010-05-19mergeRichard Nelson
2010-05-19AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statisticsLoren Shih
Fix for ambiguity around LLSD usage.
2010-05-19AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statisticsLoren Shih
Added outfit baking notification. Cleaned up some code around notifications. Added some more clarity to notification message wording.
2010-05-19EXT-7208 FIX add color / tint to tattoosNyx Linden
Adds a color swatch to tattoo wearable that allows users to color their tattoos. Defaults to white so should not affect existing tattoo wearables. Code reviewed by Vir.
2010-05-19EXT-7157 FIXED Implemented outfit items sorting in "My Outfits" tab.Sergei Litovchuk
- Moved wearable item name comparator from llcofwearables to llwearableitemslist. - Added wearable item type comparator. - Added item type and description getters to wearable item base class LLPanelInventoryListItemBase. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/407/ --HG-- branch : product-engine
2010-05-19MergeMike Antipov
--HG-- branch : product-engine
2010-05-19EXT-7104 WIP Implemented reaction on Sidebar button clickMike Antipov
Implementation details: * Added new setting SidebarWithButtonsVisibility * Sidebar bottom tray button changes its value on click (toggle state - value is TRUE) * SideTray listens changes of this setting's value and change its and its buttons visibility * expand/collapse Sidebar state is stored between changes of the setting. Reviewed by Yuri Chebotarev at https://codereview.productengine.com/secondlife/r/403/ --HG-- branch : product-engine
2010-05-19EXT-7320 FIXED Moved date time stamp template to localized xml.Alexei Arabadji
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/406/ --HG-- branch : product-engine
2010-05-19EXT-7104 WIP Added "Sidebar" button (disabled until callback is set)Mike Antipov
* Added widgets into xml, added setting and listener for context menu * added menu item to show/hide the button * button is made as may be hidden on resize Additional improvements: * Updated method to process buttons width when it is necessary to show any button via context menu * Updated LLBottomTray::initButtonsVisibility to not show warning messages if it is impossible to show a button due to bottom tray width on startup. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/403/ --HG-- branch : product-engine
2010-05-19EXT-7104 WIP Implemented a functionality to control the width of the chat ↵Mike Antipov
entry field. * LLResizeBar calls notifyParent on resizing before changing rect of view, bottomtray processed this notification to update other buttons. * Had to move setup of buttons visibility on startup into LLBottomTray to ensure all buttons have necessary visibility BEFORE restore the width of the chat entry field; * Updated layout between chatbar and speak button to show resize mouse pointer in the middle between them. Implemented behavior: visible buttons shrink to their minimal width when the chat entry field gets wider. Also were refactored: * moved declaration of settings related to buttons visibility from the settings.xml to LLBottomTray. * moved setting of control listeners to LLBottomTray. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/403/ --HG-- branch : product-engine
2010-05-19mergeVadim Savchuk
--HG-- branch : product-engine
2010-05-19EXT-7242 FIXED Added a new "Edit my Shape" link to avatar self-click context ↵Vadim Savchuk
menu and made it open the shape editing panel. Again, as in EXT-7241, I tried to improve the way the appearance panels (outfits / edit outfit / edit wearables) are switched, this time aiming to eliminate redundant time-consuming operations (fetches/updated/etc). I'm not particularly satisfied with the resulting code but it seems to work. A better solution might be to wrap the panels with LLSideTrayPanelContainer. Additional minor changes: - Fixed unsafe pointer cast in LLSidepanelAppearance::editWearable(). - Removed redundant onEditOutfitButtonClicked() and onEditWearBackClicked() methods from LLSidepanelAppearance. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/395/ --HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 11:11:55 +0000