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
a1e342b3f7
merge
2010-01-06 12:40:44 -08:00
4966073030
moved clipping logic inside LLFontGL::maxDrawableChars controlled by EWordWrapStyle
...
fixes regression introduced in 3eef5ce9ae1e6fc62b9b52ce859501dd4e70fadf
reviewed by Brad
2010-01-06 12:23:56 -08: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
08a9c1eae0
EXT-3961 : Switch order of "Wearing" and "My Outfits" tabs
...
Trivial name change to turn "accordionpanel" into "tab" for outfits tabs since those are no longer accordions.
2010-01-06 15:08:20 -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
3b7080a6b1
merge
2010-01-06 11:18:04 -08:00
1bbd259f2d
EXT-3878 - Menus disappear when UI Size is < 1.00
...
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-06 11:17:38 -08: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
1a21ce62c2
fixed EXT-3838 “[BSI] Resident profile tries to link "(none)" when Resident isn't member of any groups”,
...
avoided translating null group id as SLURL;
--HG--
branch : product-engine
2010-01-06 18:17:31 +02:00
447a908a0a
Flip this setting back to how it was.
2010-01-06 08:14:24 -08:00
dff5b2f6ec
Decreased group/ad-hoc IM control panel width to 150 pixels (EXT-3790).
...
--HG--
branch : product-engine
2010-01-06 17:39:50 +02:00
3a7e3c4328
merge
...
--HG--
branch : product-engine
2010-01-06 17:23:08 +02:00
6ee29d8c2a
work on EXT-3842 People / Recent shows residents who have not spoken or sent IM
...
--HG--
branch : product-engine
2010-01-06 17:22:25 +02:00
fdbf7c8d13
merge.
2010-01-06 07:21:30 -08:00
4f1d776da7
fix for major EXT-3999 (nobody) appears in the Recent tab after receiving system notification
...
--HG--
branch : product-engine
2010-01-06 17:18:01 +02:00
fc785febb3
Fixed normal bug EXT-3944 ('Error while moderating' dialog after disabling voice for non-connected participant avatar from miniinspector)
...
- improved condition to check if avatar can be moderated.
- if not moderation panel (with "Disable Voice" button) is not shown at all.
--HG--
branch : product-engine
2010-01-06 17:13:12 +02:00
0f89155e29
EXT-3934: On SRV timeout, don't fail, proceed with original URI.
2010-01-06 10:08:02 -05:00
c0d189a3d1
fix for low EXT-2742 Invalid menu appearance after hiding navigation bar and/or favorites bar
...
actually that was designed behavior.
--HG--
branch : product-engine
2010-01-06 15:12:09 +02: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
fd899d4ed6
Automated merge with ssh://hg.lindenlab.com/james/gooey
2010-01-05 19:14:28 -08:00
d2aabf2b1f
layout standarization for profiles
2010-01-05 19:14:09 -08: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
3892cdd32c
EXT-2006 Fix mini-map friend icon colors to be yellow
...
XML only not reviewed
2010-01-05 17:59:07 -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
8a033dba8d
Merge
2010-01-05 16:29:11 -08:00
a3adfe54cb
EXT-3332 Disabled checkboxes don't use disabled text color
...
Text label color wasn't being set in constructor.
Added example to floater_test_widgets.xml
Reviewed with Richard
2010-01-05 16:28:22 -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
ab3dbd647e
Merge
2010-01-05 15:57:09 -08:00
db6069e249
EXT-3721 SNAPSHOT PREVIEW can be dragged over the top menus
...
reviewed by Richard
2010-01-05 15:49:45 -08:00
0b0372a303
EXT-3900 [BSI] Inspector floater fades while inspectors context menu is still active
...
reviewed by Richard
2010-01-05 15:49:22 -08:00
cffe23df08
EXT-3921 [BSI] Age calculation fails on Mac and Linux
...
Was accessing wrong value out of days-per-month array, and
stepping off end of array for December.
Reviewed with Richard.
2010-01-05 15:46:40 -08:00
3fa03a6cca
EXT-3884 [BSI] group list cut off when there is room to display more - made room for more groups, but list is sent as a comma delmited string from server. Requires code change to list one per line.
2010-01-05 15:41:13 -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
abf2df530f
EXT-3884 [BSI] group list cut off when there is room to display more - made room for more groups, but list is sent as a comma delmited string from server. Requires code change to list one per line.
2010-01-05 15:19:13 -08:00
Rick Pasetto