summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-01-07Backing out llimportcollada as a singleton no more.Dave Parks
2010-01-07Backed out changeset: 0e0f8b0b0fa8Dave Parks
2010-01-06Merge from viewer2 trunk again - some fairly important fixes there.Tofu Linden
2010-01-06mergeBrad Payne (Vir Linden)
2010-01-06LLImportCollada no longer a singleton to prepare for subclassing.Dave Parks
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-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-05merge.Tofu Linden
2010-01-05Lots of fixes to parcel audio playing/stopping/autoplaying/firstuse policy.Tofu Linden
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-05Fix for EXT-3664/DEV-43374 (MEDIA SETTINGS Reset button does not work if ↵Monroe Linden
current URL is a quicktime movie) LLViewerMediaImpl::initializeMedia() was assuming an invalid invariant (that mMimeType was associated with the currently loaded plugin). Fixed by adding a new member variable, mCurrentMimeType, which reflects the MIME type that caused the currently loaded plugin to be loaded, and using that instead of mMimeType when determining whether to reload the plugin.
2010-01-05Fix for EXT-3069 (Media Browser lets you click on Back button on first page).Monroe Linden
Fix was to have the webkit plugin clear the llqtwebkit history on the first real navigateComplete event.
2010-01-05Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-05EXT-3649 EXT-3662 : Move media controls to above media faceRick Pasetto
Review #69 This changes where and how the media controls are laid out, and ensures that all of the media region (the face) is clickable. Also moved the volume slider to below the controls (this took WAY too long to do ​:( ​), and adjusted the window region in which the media controls are allowed to be displayed.
2010-01-05mergeBrad Payne (Vir Linden)
2010-01-05merge.Tofu Linden
2010-01-05DEV-44775 pref incorrectly named 'AudioSteamingMedia' in many placesTofu Linden
2010-01-05EXT-3961 switch "wearing" and "my outfits"Nyx (Neal Orman)
XUI change, super simple. reviewed by Seraph.
2010-01-05mergeBrad Payne (Vir Linden)
2010-01-05For EXT-3923: added additional warnings to catch corrupted wearables in ↵Brad Payne (Vir Linden)
inventory
2010-01-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-01-05EXT-3948 outfit title does not update on outfit creationNyx (Neal Orman)
now on creating a new outfit we remove the old base folder link and replace it with a link to the newly created outfit folder. Responsive UI FTW! Code reviewed by Vir
2010-01-05Fix for EXT-3918 (Nearby media list displays Home URL when media is not ↵Monroe Linden
playing).
2010-01-05DEV-44767 lookat stays locked on object/avatar after 'esc' camera resetTofu Linden
2010-01-05Allow for finer-grained control over avatar volumeRick Pasetto
2010-01-05Fixed bug EXT-3945 ('Call' option in miniinspector's gear menu does nothing) ↵Vadim Savchuk
by hooking the menu item up. --HG-- branch : product-engine
2010-01-05Minor spelling issue.Vadim Savchuk
--HG-- branch : product-engine
2010-01-05Fixed bug EXT-3791 (No feedback provided when offering teleport): the offer ↵Vadim Savchuk
is now logged to the IM history. --HG-- branch : product-engine
2010-01-05mergeVadim Savchuk
--HG-- branch : product-engine
2010-01-05Fixed bug EXT-3750 (IM window min size too large):Vadim Savchuk
* Decreased minimum IM window size. * Removed gaps between buttons on the left. --HG-- branch : product-engine
2010-01-05Fixed potential crash if LLFlatListView is created as a dummy widget.Vadim Savchuk
--HG-- branch : product-engine
2010-01-05mergeYuri Chebotarev
--HG-- branch : product-engine