summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-05-28A possible fix for EXT-7032: [crashhunters] crash in libcurl background ↵Xiaohong Bao
thread on windows. killed accessing the asset server for map textures after http returns 404.
2010-05-21Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicXiaohong Bao
2010-05-21EXT-7394: FIXED: Trees have more polys at low detail than at high detail.Xiaohong Bao
2010-05-21Fix for EXT-5667 (support window.open() in shared media so google docs will ↵Monroe Linden
work). Moved the processing of clicks on _external and _blank targeted links from LLMediaCtrl to LLViewerMediaImpl. Removed LLMediaCtrl::setOpenInExternalBrowser() since that functionality is available through the use of the _external target attribute in web content. Removed LLMediaCtrl:: setOpenInInternalBrowser() since it was unimplemented and not used. Made the webkit media plugin set llqtwebkit's window open behavior to WOB_SIMULATE_BLANK_HREF_CLICK. This is #ifdefed out on Linux until we get a new Linux build of llqtwebkit.
2010-05-21Fixed Windows line endings that crept inCallum Prentice
2010-05-21MergeCallum Prentice
2010-05-21VI-65 - Addition of Quick/Eazy Buy Web based floater.Callum Prentice
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency' Reviewed by Sam/Richard
2010-05-21merge.Tofu Linden
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-21More for EXT-7309: Investigate turning RenderAvatarMaxVisible down to 1 or 2 ↵Xiaohong Bao
on low end hardware. set RenderAvatarMaxVisible to be 3 by default for low-end settings.
2010-05-21Updated Linux build of llqtwebkit, adding some support we'll need to fix ↵Tofu Linden
EXT-5667 (support window.open() in shared media so google docs will work).
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-20More for EXT-7309: Investigate turning RenderAvatarMaxVisible down to 1 or 2 ↵Xiaohong Bao
on low end hardware. adjust the arrangements of the panel "preferences -> graphics -> Advanced".
2010-05-20MergeXiaohong Bao
2010-05-20EXT-7309: PARTIAL FIXED: Investigate turning RenderAvatarMaxVisible down to ↵Xiaohong Bao
1 or 2 on low end hardware. added a slider in "preferences -> graphics -> Advanced" to change RenderAvatarMaxVisible value.
2010-05-20MergeXiaohong Bao
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-19Updated Windows build of llqtwebkit, adding some support we'll need to fix ↵Monroe Linden
EXT-5667 (support window.open() in shared media so google docs will work). revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision ff8a72a3078b in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the default branch)
2010-05-19Updated Mac build of llqtwebkit, adding some support we'll need to fix ↵Monroe Linden
EXT-5667 (support window.open() in shared media so google docs will work). revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision e2eaaf8b3e96 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the default branch)
2010-05-19mergeRichard Nelson
2010-05-19automated mergeRoxie Linden
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-19EXT-7410 Update Vivox SDK to 3.1.0001.8744Roxie 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 22:43:16 +0000