summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-02Manual merge from default branch. Resolved conflicts in ↵Vadim Savchuk
indra/newview/llfloatercamera.cpp. --HG-- branch : product-engine
2010-08-02EXT-6542 Localized the "none/none" in the About land floater.Vadim Savchuk
This is an additional fix to the one made in rev. 6788ff579917. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/828/ --HG-- branch : product-engine
2010-08-02Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-30Merge.Kent Quirk
2010-07-30fixed windows buildRichard Nelson
2010-07-30mergeRichard Nelson
2010-07-30optimizations in button renderingRichard Nelson
2010-07-30Automated merge with ssh://richard@hg.lindenlab.com/dessie/viewer-publicRick Pasetto
2010-07-30fix for macRick Pasetto
2010-07-30Fix mac build.Monroe Linden
2010-07-30fix for mac buildRick Pasetto
2010-07-30Fix for EXT-8533Monroe Linden
When sending the MIME type probe, tell LLCurl to allow cookies in the response. This works around an issue with some sites that will get into an infinite redirect loop when cookies are disabled.
2010-07-30Upgraded NVIDIA 120 and 220 to class 1. They're performing too well.Palmer
2010-07-30fixed windows buildRichard Nelson
2010-07-30mergeRichard Nelson
2010-07-30further UI rendering performance improvementsRichard Nelson
2010-07-30Fix for EXT-8339Monroe Linden
Added a couple of new nav states to LLViewerMediaImpl: MEDIANAVSTATE_FIRST_LOCATION_CHANGED_SPURIOUS and MEDIANAVSTATE_COMPLETE_BEFORE_LOCATION_CHANGED_SPURIOUS. These behave just like the corresponding states without the _SPURIOUS suffix, but will be used if the new navigate doesn't change the current URL of the impl. This allows us to catch cases like the repro of this issue and discard the spurious navigate events.
2010-07-30fix for DEV-52379 (viewer is not successfully caching object goemetry)Andrew Meadows
There was a typo between the files saved and those loaded. saved in sobjects_gridx_gridy.slc bload loaded from objects_gridx_gridy.slc Q will review later ;-)
2010-07-30remove useless assert and its temp variable that broke the build.Kent Quirk
2010-07-30mergeRichard Nelson
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-07-30changed to use childSetAction without void* argumentRichard Nelson
2010-07-30added LLPanel::childSetAction() that does not take a void* argumentRichard Nelson
implemented childGetVisibleTab/PanelWithHelp using breadth-first-search iterator moved tentative state from llview to lluictrl changes llcallbackmap to use boost::function
2010-07-30removed void* from ui callbacks and deprecated LLPanel::child*() methodsRichard Nelson
2010-07-30converted static callbacks to member functions and deprecated ↵Richard Nelson
LLPanel::child*() methods
2010-07-30converted static callbacks to member functions and deprecated ↵Richard Nelson
LLPanel::child*() methods
2010-07-30converted static callbacks to member functionsRichard Nelson
2010-07-30MergeKent Quirk
2010-07-30Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1Kent Quirk
2010-07-30EXT-7796 ADDITIOANL FIXED Reopen reason - Camera Floater did not take into ↵Mike Antipov
account edit appearance mode while it is being built. FIX: Store the "edit appearance" mode as internal floater's flag and apply it while building to ensure that its controls have right "enable" state. Also added forcing of Pan Camera mode if floater is opened first time in Edit appearance mode. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/824/ --HG-- branch : product-engine
2010-07-30EXT-8161 FIXED Moved Invite button 5 px to the right to prevent cropping its ↵Mike Antipov
border (when selected) by parent. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/827/ --HG-- branch : product-engine
2010-07-30Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-07-30remove a nonsense assert that gcc was choking on.Tofu Linden
2010-07-30Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-07-30merge from viewer-releaseTofu Linden
2010-07-30merge from PE's viewer-releaseTofu Linden
2010-07-30merge from PE's viewer-trunkTofu Linden
2010-07-30mergeTofu Linden
2010-07-30EXT-8522 FIXED (Code improvements: Update a way in which Nearby people list ↵Mike Antipov
is controlled depend on its visibility to user) 1. Removed special processing of Nearby People List Updater when: * tabs in People panel are changed; * People panel change its visibility. 2. Subscribed Nearby People List Updater's setActive() method directly to Nearby list Panel's onVisibleChange callback. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/825/ --HG-- branch : product-engine
2010-07-29Yet more cleanup around llmediadataclient.Monroe Linden
In LLVOVolume, added a count of LLMediaDataClientObjectImpl objects referencing each LLVOVolume object. This allows LLVOVolume::markDead() to skip the relatively expensive calls to removeFromQueue() when the LLVOVolume is known to have no active references. Refactored LLMediaDataClient and its two child classes so that only LLObjectMediaDataClient has the round-robin queue (LLObjectMediaNavigateClient doesn't need it), and cleaned up some of the virtual function hierarchy around queue processing. In LLMediaDataClient, added tracking for requests that aren't currently in a queue (i.e. requests that are in flight or waiting for retries) so they can be found when their objects are marked dead. LLMediaDataClient::Request now directly keeps track of the object ID and face associated with the request. Removed the "markedSent" concept from requests. Requests that have been sent are no longer kept in a queue. The Retry timer now references the Request object instead of the Responder. Replaced LLMediaDataClient::findOrRemove() with separate template functions for find and remove.
2010-07-29removed unnecessary hack (no repro for EXT-8259, possibly due to other ↵Richard Linden
recent lltextbase changes)
2010-07-29mergeTofu Linden
2010-07-29mergeRichard Linden
2010-07-29fix for vertical truncation of sidebar headersRichard Linden
2010-07-29fix for truncated text renderingRichard Linden
2010-07-29mergeTofu Linden
2010-07-29Backed out changeset b4c03b57a34fTofu Linden
2010-07-29Backed out changeset 61a2e2a8fb75Tofu Linden
2010-07-29EXT-8043 FIXED Fixed wrong position of notifications when 'Move' or 'View' ↵Andrew Dyukov
floaters are open and docked. Bug was caused by LLDockableFloater's mOverlapsScreenChannel to false only in one of it's constructors. So some floaters got initial value of mOverlapsScreenChannel depending on system- that's why bug reproduced on Windows and didn't reproduce on Linux. - Moved setting mOverlapsScreenChannel to false into LLDockableFloater's init() which is called by all of it's constructors. Reviewed by Alexei Arabadji at https://codereview.productengine.com/secondlife/r/818 --HG-- branch : product-engine
2010-07-29EXT-8501 FIXED Check menu items always looked as checked.Vadim Savchuk
Reason: Check menu items (instances of LLMenuItemCheckGL) had used LLUICtrl::getValue() to know whether they should draw the checkmark. Recently this was broken when getValue() was overriden in LLMenuItemCallGL to return a string. Fix: Overriden getValue() in LLMenuItemCheckGL to return a boolean value, not a string. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/821/ --HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 09:46:48 +0000