93dc1cd3b0
Make zoom level closer
2010-01-06 17:37:19 -08:00
49a744b676
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-06 13:28:58 -08:00
5cd4fabccb
EXT-3201: bring up inspector tooltip if object has media
2010-01-06 13:21:49 -08:00
327069dcb8
merge
2010-01-06 16:19:30 -05:00
703694d1da
For EXT-3812: Inventory Loss between 1.23 to 2.0 logins. One possible cause is broken links, which this fix will detect earlier, avoiding a needlessly alarming message
2010-01-06 15:10:00 -05:00
7586d8fcfd
fix for EXT-2903 ([BSI] Activating inspector while "Zoomed into Media" 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-06 12:01:39 -08:00
d16f6a6e1a
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-06 14:48:01 -05:00
2978609575
Fix for EXT-3730 (Current (temporary) Find URL returns an HTTP status code 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-06 11:38:00 -08:00
fed5834238
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-06 14:30:48 -05:00
657cbc3b74
Merge previously-unmerged product-engine commit
2010-01-06 14:29:26 -05:00
84ff7485ae
Minor merge fix of redundant test
2010-01-06 13:13:59 -05:00
64de7f8e64
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-06 13:07:18 -05:00
d9b8f65c03
automated merge viewer2.0->viewer2.0
2010-01-06 12:34:02 -05:00
cdb158e9e0
EXT-3954 : "Wear" button shouldn't be enabled in "Wearing" tab
...
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-06 12:33:28 -05:00
71460d3e7e
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-06 12:26:02 -05:00
a84beb2a43
EXT-3692: Buy & Pay buttons on side panel object profile now only enabled when you can pay or buy the object.
...
-Reviewed by nyx
2010-01-06 12:25:23 -05:00
c55cb905fb
EXT-3668- Trash icon now disables if nothing selected in appearance side panel.
...
Remove link and delete outfit also correspondingly auto enable / disable properly now.
-Reviewed by nyx
2010-01-06 12:24:14 -05:00
447a908a0a
Flip this setting back to how it was.
2010-01-06 08:14:24 -08:00
fdbf7c8d13
merge.
2010-01-06 07:21:30 -08:00
0f89155e29
EXT-3934: On SRV timeout, don't fail, proceed with original URI.
2010-01-06 10:08:02 -05:00
af61dd45b3
Fixed major bug EXT-3960 (group none cannot be activated through context 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-06 14:30:21 +02:00
b150aaf1b9
fixed EXT-3922 “[BSI] Chatlog file contains all names twice”,
...
removed redundant 'from name' from chat log;
--HG--
branch : product-engine
2010-01-06 13:08:55 +02:00
aa5aff1d79
Merge from default branch.
...
--HG--
branch : product-engine
2010-01-06 12:58:33 +02:00
71e9342159
merge.
2010-01-05 19:05:07 -08:00
0c91cfc49c
Lots of fixes to parcel audio playing/stopping/autoplaying/firstuse policy.
2010-01-05 19:04:45 -08:00
93417fe004
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-05 17:01:53 -08:00
8d2f925f26
EXT-3588 Grey-out "gear" icon if not all faces selected have media
...
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-05 17:01:40 -08:00
34191fcc2c
Fix for EXT-3664/DEV-43374 (MEDIA SETTINGS Reset button does not work if 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-05 16:16:57 -08:00
f119a86461
Fix for EXT-3069 (Media Browser lets you click on Back button on first page).
...
Fix was to have the webkit plugin clear the llqtwebkit history on the first real navigateComplete event.
2010-01-05 15:23:52 -08:00
5995bcd5a7
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-05 14:33:48 -08:00
4a870a0887
EXT-3649 EXT-3662 : Move media controls to above media face
...
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-05 14:33:27 -08:00
e90fbe5b27
merge
2010-01-05 16:47:05 -05:00
5a99682d16
merge.
2010-01-05 13:38:20 -08:00
5836902ba0
DEV-44775 pref incorrectly named 'AudioSteamingMedia' in many places
2010-01-05 13:37:37 -08:00
2ee8c95763
EXT-3961 switch "wearing" and "my outfits"
...
XUI change, super simple. reviewed by Seraph.
2010-01-05 16:36:05 -05:00
2b63486542
merge
2010-01-05 16:27:12 -05:00
09326838c5
For EXT-3923: added additional warnings to catch corrupted wearables in inventory
2010-01-05 16:26:17 -05:00
828cf66ce3
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-05 16:20:09 -05:00
60959b39c6
EXT-3948 outfit title does not update on outfit creation
...
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-05 16:20:01 -05:00
3e4c0de072
Fix for EXT-3918 (Nearby media list displays Home URL when media is not playing).
2010-01-05 13:16:18 -08:00
3390ea8582
DEV-44767 lookat stays locked on object/avatar after 'esc' camera reset
2010-01-05 12:56:19 -08:00
4f05aa09f1
Allow for finer-grained control over avatar volume
2010-01-05 12:16:57 -08:00
a22df89f3b
Fixed bug EXT-3945 ('Call' option in miniinspector's gear menu does nothing) by hooking the menu item up.
...
--HG--
branch : product-engine
2010-01-05 21:05:35 +02:00
f9a2b8f9de
Minor spelling issue.
...
--HG--
branch : product-engine
2010-01-05 20:22:50 +02:00
62014dd423
Fixed bug EXT-3791 (No feedback provided when offering teleport): the offer is now logged to the IM history.
...
--HG--
branch : product-engine
2010-01-05 20:20:09 +02:00
bea3042c48
merge
...
--HG--
branch : product-engine
2010-01-05 19:41:48 +02:00
babc73682d
Fixed bug EXT-3750 (IM window min size too large):
...
* Decreased minimum IM window size.
* Removed gaps between buttons on the left.
--HG--
branch : product-engine
2010-01-05 19:38:34 +02:00
21d5410d1a
Fixed potential crash if LLFlatListView is created as a dummy widget.
...
--HG--
branch : product-engine
2010-01-05 19:32:25 +02:00
4a333f3731
merge
...
--HG--
branch : product-engine
2010-01-05 17:56:45 +02:00
71c0973a1e
more work on EXT-1649 Groups you chatted in recently show up in the Recent People tab
...
previous place for adding recent people was wrong...move this to LLIMSession.
--HG--
branch : product-engine
2010-01-05 17:56:13 +02:00
Rick Pasetto