summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-01-12Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-12Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallumRick Pasetto
2010-01-12EXT-1331 Fix for avatars not rendering after they are loaded until camera is ↵Dave Parks
moved.
2010-01-12Add restoring of previous cursor to mac implRick Pasetto
http://codereview.lindenlab.com/273045
2010-01-12MergeDave Parks
2010-01-12DEV-44675 Fix for sky wierdness on ATI 9.12 drivers.Dave Parks
2010-01-12mergeBrad Payne (Vir Linden)
2010-01-12Removed some diagnostic code that got inadvertently left inBrad Payne (Vir Linden)
2010-01-11Add cursor-change override while dragging on the macRick Pasetto
This changes the setCursor() call in LLWindowMacOSX to be ignored if we're currently dragging via the OS http://codereview.lindenlab.com/273045
2010-01-11Fix for black/grey look at login screen and backspace going back in ↵Monroe Linden
search/help windows. This should address EXT-4097. Added a notion of "background color" to LLViewerMediaImpl and LLPluginClassMedia. Added background color parameters to the size_change message. Webkit plugin now sets the background color of the instance from the supplied background color, and navigates to a data: url with that background color instead of about:blank as its initial navigate. Webkit plugin now no longer waits for the first onPageChanged event LLViewerMediaImpl now clears the texture to the background color when initializing it. Made LLMediaCtrl fill with its opaque background color when the media impl isn't set up yet. Removed the initial data URL from the search and help floaters, since what it was doing is now handled internally by the new background color code. Reviewed by callum and rick.
2010-01-11Merge with tipCallum Prentice
2010-01-11Fix that stops "Start Location" corruption if you drag an invalid ↵Callum Prentice
http://slurl.com SLURL onto the login page
2010-01-11Fix unposted bug: drag feedback didn't check whitelistRick Pasetto
http://codereview.lindenlab.com/274039/show
2010-01-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Xiaohong Bao
2010-01-11fix for EXT-4164: llrender/llimagegl.cpp(1111): ASSERT(mCurrentDiscardLevel>=0)Xiaohong Bao
2010-01-11mergeRick Pasetto
2010-01-11FIX EXT-3972: Don't put up the "multiple media" dialog just because the user ↵Rick Pasetto
doesn't have the "Select Face" tool selected.
2010-01-11Avoid an assertion failure in texture baking. Reviewed by Nyx. Deemed ↵Tofu Linden
'tiny'...
2010-01-11Merge.Tofu Linden
2010-01-11EXT-4163 Don't strip viewer symbols, or tar the result, in DEBUG buildsTofu Linden
2010-01-11mergeBrad Payne (Vir Linden)
2010-01-11Better resolution of merge conflictJames Cook
2010-01-11mergeBrad Payne (Vir Linden)
2010-01-11Merge, sync from viewer-2-0, fixed conflict in llinspectavatar.cppJames Cook
2010-01-11MergeJames Cook
2010-01-11EXT-3687 Inventory and Outfits lists don't fill panel need DkGray2 backgroundJames Cook
EXT-4044 Inventory and Outfits scroll region has no background color/border Moved background color initialization to inventory_panel.xml Fixed search highlight color and extra borders no longer needed now that colors are correct. Reviewed with Simon.
2010-01-11mergeBrad Payne (Vir Linden)
2010-01-11For EXT-4068: [BSI] right click several times on an inventory item produces ↵Brad Payne (Vir Linden)
several second hang. Improved speed of panel finding by restricting search to only panels, saving time when inventory is very large
2010-01-11ext-3820 [BSI] Preferences > Chat > Show IMs In: does not take effect ↵Lis Linden
without restart
2010-01-11ext-4015 Preferences: non-standard position of field labelsLis Linden
2010-01-11automated merge viewer2.0->viewer2.0Loren Shih
2010-01-11Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Linden
2010-01-11ext-4116 bad label position on Region/Estate/ Ground TexturesLis Linden
2010-01-11MergeJames Cook
2010-01-11EXT-3695, EXT-2034 Line height, padding in inventory customizable in XUI viaJames Cook
folder_view_item.xml EXT-3753 Inventory folders now have customizable item indents and "My Inventory" has indent again Reviewed with Richard
2010-01-11Merge with tipCallum Prentice
2010-01-11Fix for EXT-3991 - "add url to security for MoAP floater is devoid of ↵Callum Prentice
standard floater information"
2010-01-11EXT-4154 : Memory leak from FetchObservers in AppearanceSPLoren Shih
Member observers of LLSidepanelAppearance are now deleted appropriately.
2010-01-11Automated merge with ssh://hg.lindenlab.com/james/gooeyErica
2010-01-11New art for landmarks and places - replacing the pushpin with a globe - ↵Erica
reviewed with esbee
2010-01-11Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-11Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Linden
2010-01-11ext-3910 Instant Messages isn't in ALL CAPS like other windowsLis Linden
2010-01-11Merge backout of b6030bb6ff40Rick Pasetto
2010-01-11Backed out changeset b6030bb6ff40Rick Pasetto
2010-01-11Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-11Fix build issue with ba93e704bd4fRick Pasetto
2010-01-11MergeRunitai
2010-01-11EXT-3784 Fix for first menu item going blank when highlighted on ATI cards.Runitai
2010-01-11MergeJames Cook