summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-01-07Merge latest fixes from viewer2.Tofu Linden
2010-01-07Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-07DEV-44129 EXT-3662 - Make all layout panels mouse_opaqueRick Pasetto
This makes the area below the controls click-through (otherwise it blocks mouse events). That area is for the volume slider.
2010-01-07Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-01-07EXT-3973 viewer crashNyx (Neal Orman)
Rendering cost calculations didn't handle the case of a face having no image associated with it. Added in null checks before using the pointer to the image. Crash no longer repros. Code reviewed by Vir.
2010-01-07Backing out llimportcollada as a singleton no more.Dave Parks
2010-01-07Backed out changeset: 0e0f8b0b0fa8Dave Parks
2010-01-06Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-06Make zoom level closerRick Pasetto
2010-01-06DEV-44804 autoplay preference for media should enable the media subsystem ↵Tofu Linden
when toggled from off to on
2010-01-06Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2010-01-06EXT-3962: added "MyOutfitsAutofill" debug setting to force auto population.Eric M. Tulla (BigPapi)
2010-01-06mergerichard
2010-01-06Merge from viewer2 trunk again - some fairly important fixes there.Tofu Linden
2010-01-06Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-06EXT-3201: bring up inspector tooltip if object has mediaRick Pasetto
2010-01-06mergeBrad Payne (Vir Linden)
2010-01-06LLImportCollada no longer a singleton to prepare for subclassing.Dave Parks
2010-01-06mergerichard
2010-01-06moved clipping logic inside LLFontGL::maxDrawableChars controlled by ↵richard
EWordWrapStyle fixes regression introduced in 3eef5ce9ae1e6fc62b9b52ce859501dd4e70fadf reviewed by Brad
2010-01-06For EXT-3812: Inventory Loss between 1.23 to 2.0 logins. One possible cause ↵Brad Payne (Vir Linden)
is broken links, which this fix will detect earlier, avoiding a needlessly alarming message
2010-01-06fix for EXT-2903 ([BSI] Activating inspector while "Zoomed into Media" ↵Monroe Linden
results in broken inspector) Media Focus and the inspector were fighting over the object selection. Fixed by calling LLViewerMediaFocus::clearFocus() right before setting the selection in LLInspectObject::onOpen().
2010-01-06Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2010-01-06Fix for EXT-3730 (Current (temporary) Find URL returns an HTTP status code ↵Monroe Linden
of 500 (Internal server error)) We now no longer check the error code returned from the MIME type probe. If we have a mime type, use it, regardless of the status. If not, default to the web plugin and let it handle error reporting.
2010-01-06Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2010-01-06Merge previously-unmerged product-engine commitNat Goodspeed
2010-01-06mergerichard
2010-01-06EXT-3878 - Menus disappear when UI Size is < 1.00richard
EXT-3647 - Auto-scrolling of IMs should resume when user types in chat EXT-3877 - Pinning two levels of menus prevents movement using arrow keys EXT-1303 - Hyperlink text wraps in the middle of a word reviewed by James
2010-01-06Minor merge fix of redundant testEric M. Tulla (BigPapi)
2010-01-06Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2010-01-06automated merge viewer2.0->viewer2.0Loren Shih
2010-01-06EXT-3954 : "Wear" button shouldn't be enabled in "Wearing" tabLoren Shih
EXT-3952 : "Make Outfit" button shouldn't be enabled in "Wearing" tab EXT-3955 : "Add to Current Outfit" gear menu option confusing, remove it EXT-3961 : Switch order of "Wearing" and "My Outfits" tabs Most of these are very minor xui/button-state changes. Also added a new onOpen method to llpaneloutfitsinventory so that it can update its state (notably, which tab is active) when the sidepanel is opened.
2010-01-06Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2010-01-06EXT-3692: Buy & Pay buttons on side panel object profile now only enabled ↵Eric M. Tulla (BigPapi)
when you can pay or buy the object. -Reviewed by nyx
2010-01-06EXT-3668- Trash icon now disables if nothing selected in appearance side panel.Eric M. Tulla (BigPapi)
Remove link and delete outfit also correspondingly auto enable / disable properly now. -Reviewed by nyx
2010-01-06Flip this setting back to how it was.Tofu Linden
2010-01-06merge.Tofu Linden
2010-01-06EXT-3934: On SRV timeout, don't fail, proceed with original URI.Nat Goodspeed
2010-01-06Fixed major bug EXT-3960 (group none cannot be activated through context ↵Mike Antipov
menu, but checkbox button works) - updated condition to enable "Activate" menu item for any group - also cleaned commented out code --HG-- branch : product-engine
2010-01-06fixed EXT-3922 “[BSI] Chatlog file contains all names twice”,Alexei Arabadji
removed redundant 'from name' from chat log; --HG-- branch : product-engine
2010-01-06Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2010-01-05Automated merge with ssh://hg.lindenlab.com/james/gooeyErica
2010-01-05layout standarization for profilesErica
2010-01-05merge.Tofu Linden
2010-01-05Lots of fixes to parcel audio playing/stopping/autoplaying/firstuse policy.Tofu Linden
2010-01-05EXT-2006 Fix mini-map friend icon colors to be yellowJames Cook
XML only not reviewed
2010-01-05Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-05EXT-3588 Grey-out "gear" icon if not all faces selected have mediaRick Pasetto
We've gone back and forth on this, but we've decided that there are just too many ways to accidentally add media to multiple faces when you don't mean to. This helps in one small way: by disabling the gear icon unless all selected faces have media.
2010-01-05MergeJames Cook
2010-01-05EXT-3332 Disabled checkboxes don't use disabled text colorJames Cook
Text label color wasn't being set in constructor. Added example to floater_test_widgets.xml Reviewed with Richard