summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-05-20EXT-7287 FIX IT remove overrideEli Linden
2010-05-20automated mergeRoxie Linden
2010-05-20kill dos line-ending.Tofu Linden
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
2010-05-19mergeIgor Borovkov
--HG-- branch : product-engine
2010-05-19EXT-7234 FIXED whether folder view or list view is currently used is decided ↵Igor Borovkov
by their visibility deciding which list to use (folder/list view) depending on their conrainers visibility Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/405/ --HG-- branch : product-engine
2010-05-19Manual merge from default branchVadim Savchuk
Resolved conflicts in: - indra/newview/skins/default/xui/en/floater_world_map.xml - indra/newview/skins/default/xui/en/notifications.xml --HG-- branch : product-engine
2010-05-19merge from PE's viewer-trunkTofu Linden
2010-05-19DEV-50239 - windows 2.0 viewer using 'ruth' as default avatar on SLE gridsRoxie Linden
The problem, llstartup was parsing the login response indicating the newuser-config (which contains the default avs) incorrectly. The response is returned as a map within an array (<array><map>...</map></array>) We were parsing it as a simple map.
2010-05-19Add digicert high assurence CARoxie Linden
2010-05-19automated mergeRoxie Linden
2010-05-19EXT-7219 FIXED Hooked up the avatar gender radio buttonsPaul Guslisty
- Added callback for radio buttons Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/392/ --HG-- branch : product-engine
2010-05-18Allow update of the default CAs on installRoxie Linden
2010-05-18mergeRichard Linden
2010-05-18EXT-7398 FIXED negative top/bottom coordinates do the wrong thing with ↵Richard Linden
topleft layout reviewed by Leyla
2010-05-18Add missing debug gridsRoxie Linden
2010-05-18Fix for build error (not from my code ;-) ).Loren Shih
2010-05-18FIX: crash on texture load callback timer.Nyx (Neal Orman)
After reviewing with bao, re-initialize memory to be NULL after delete to ensure that stray callbacks don't try to use it.
2010-05-18Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-18crash prevention for viewer debug logging.Nyx (Neal Orman)
Will be code reviewed before push, will be removed before release. -Nyx