Steve Bennetts
7f3af8bc38
merge
2009-10-26 16:03:34 -07:00
Steve Bennetts
b078c44c9f
EXT-1402 - Thousands of "WARNING: LLAssetStorage::getAssetData: Discarding duplicate request for asset" lines
...
Added a list of requested landmark assets and limited the frequency of multiple requests for the same asset
2009-10-26 15:25:55 -07:00
richard
3e9a8c1f43
merge
2009-10-26 14:28:41 -07:00
richard
f2a48ed7f9
merge
2009-10-26 14:28:09 -07:00
richard
977dd84534
tweaked clipping rect for scroll containers to not overlap vertical scrollbar
...
fixed reflow logic when resizing text editors that contain widgets (would make text appear and disappear)
reviewed by James
2009-10-26 14:25:45 -07:00
Steve Bennetts
771fe6cb8d
Re labled "About Land" links back to "About Land" for 2.0.
2009-10-26 14:16:48 -07:00
Rick Pasetto
6698c681fd
Add some logging to perhaps discern more information about reported crashes
2009-10-26 14:06:42 -07:00
callum
e84ff39e4c
Merge
2009-10-26 11:41:39 -07:00
Rick Pasetto
bc6aa9445f
merge from remote repo
2009-10-26 10:40:41 -07:00
Rick Pasetto
3f0b2307b5
Mac build fix; fix error about hidden functions in llui_libtest.cpp
2009-10-26 10:39:36 -07:00
Steve Bennetts
d6e8f32b80
merge
2009-10-26 09:59:39 -07:00
callum
c5bd549b27
Merge
2009-10-26 09:28:22 -07:00
callum
d8ed8489b0
Fixed up mouseEvent function to reflect mouse button
2009-10-26 09:27:56 -07:00
Steve Bennetts
53c972a521
* Changes to enable differentiating between icon texture priority and other UI texture priority.
...
* Still need to only request smaller mip maps of icon textures
2009-10-25 23:05:15 -07:00
Adam Moss
add9298c1e
DEV-41803 class2 deferred light smoothing wrong in creases
...
to be reviewed by davep
2009-10-24 14:19:29 +00:00
callum
62e0e51b43
Merge
2009-10-23 17:08:36 -07:00
Erica Firment
4bc3b5f3db
merge
2009-10-23 16:52:43 -07:00
Erica Firment
d9b6c6cbd7
EXT-1702, EXT-1692, Viewer 2.0 Fit & Finish Pass: People Panel - Profile
2009-10-23 16:48:02 -07:00
James Cook
07f7247dff
merge
2009-10-23 16:44:23 -07:00
James Cook
71822edfe8
EXT-968 Side tray buttons have "selected" appearance when each tab is selected.
...
Changed mTabs to hold LLSideTrayTab* so we don't have to dynamic_cast<> everywhere
Reviewed with Leyla.
2009-10-23 16:40:10 -07:00
callum
3008b3fdc0
Main change is pointing install.xml for Windows to new version of LLQtWebKit that has DLLs with no manifest as per recent build change.
...
Tweaked bookamrks for test app too.
Finally, added fix for DEV-41392 (Home URL Preview should be next to the Home URL)
2009-10-23 16:19:04 -07:00
skolb
2b69cb9e9c
Merged change to auto play pref (DEV-41787)
2009-10-23 15:34:15 -07:00
skolb
913786a62b
DEV-41787 Media Auto Play controls were removed from prefs. Also made auto play override prim settings.
2009-10-23 15:29:00 -07:00
Neal Orman
576b8fe6ec
EXT-1809 Wearing an item doesn't update avatar
...
Two part fix: prevented the copying of wearable parameters to the avatar to trigger a rebake.
Then: Called wearableUpdated every time a wearable was added/removed/replaced and ensured it properly invalidated the composite
Confirmed working fix on developer machine.
Code reviewed by Seraph.
2009-10-23 22:19:15 +00:00
Monroe Linden
376deff7a3
Changes to match new version of llqtwebkit -- passing modifier keys through to most user events and using new scroll wheel event.
2009-10-23 14:28:21 -07:00
Steve Bennetts
4ddaa866dd
merge
2009-10-23 12:18:46 -07:00
Steve Bennetts
80b682d4b4
merge
2009-10-23 12:17:30 -07:00
Steve Bennetts
127b428863
merge
2009-10-23 12:15:22 -07:00
Loren Shih
a5453d45fe
For EXT-1863 : "Wear" and "Take Off" for items should be properly greyed out depending on item worn state
2009-10-23 17:41:32 +00:00
Steven Bennetts
b43771cad5
Merging revisions 2156-2183 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry
...
* Bugs: EXT-1590 EXT-1694 EXT-1660 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571 EXT-1572
* Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611 EXT-1256 EXT-1758 EXT-747
2009-10-23 17:20:45 +00:00
Loren Shih
0220106ecd
For EXT-1862 : Wearing an item shouldn't refocus to COF
2009-10-23 16:33:31 +00:00
Loren Shih
584962d5c7
svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845
2009-10-23 15:21:49 +00:00
Nat Goodspeed
2438a9168b
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-23 09:56:16 -04:00
angela
312cf3cf88
EXT-1698 I18N: the string (worn) or (worn on left hand) wont honor its translation
2009-10-23 20:07:53 +08:00
Eric Tulla
9c3ae7a243
Fix for DEV-41563 / EXT-1814. Partial revert of revision 136284.
...
These textures are used during terrain rendering. Not having them also
breaks invisiprims in an interesting way.
2009-10-23 07:02:30 +00:00
angela
c8485374dd
add help topic to floater media setting and it's panels
2009-10-23 12:06:31 +08:00
callum
0e6c92ec06
Merge before push
2009-10-22 18:11:23 -07:00
richard
f31b0baff4
merge
2009-10-22 18:10:47 -07:00
callum
318e4784d2
No Jira - added some new bookmarks to include Flash based sites
...
for testing purposes.
2009-10-22 18:09:38 -07:00
callum
bd981a4b83
Fix for DEV-41643 "stray "(none)" in the Media Settings Controls"
...
removing name attribute stopped "Missing String" message
appearing - don't know why - asking around.
2009-10-22 18:09:08 -07:00
richard
12c38ccd6a
Ext-1110 - Unable to select whole text by mouse in the text widget
2009-10-22 18:09:07 -07:00
richard
87b079bd6b
fix for text history being lost when closing chat history floater
...
reviewed by James
2009-10-22 17:38:26 -07:00
James Cook
07ffe9c149
merge from pull
2009-10-22 17:36:00 -07:00
James Cook
350138e2bb
EXT-287 Side tray open/close arrows are now an image, not the text "<<" and ">>"
...
Removed some dead code from LLSideTray
Next step is to merge all the tab art with overlay art and use button selected images to show a "pressed" state for all buttons.
Reviewed with Angela.
2009-10-22 17:30:45 -07:00
Steve Bennetts
b88fc256a3
EXT-1654 - Attempt to fix crash on close by cleaning up some callbacks
...
Reviewed by Richard
2009-10-22 17:07:33 -07:00
Nat Goodspeed
716e2b8dd2
Let Python handle quoting of Mac run_command() args (using %r).
2009-10-22 20:06:54 -04:00
Erica Firment
9ca162fbfe
moose
2009-10-22 16:09:49 -07:00
erica
872ecdbec6
EXT-1449 Viewer 2.0 Fit & Finish Pass: Places Panel - Landmark detail -actually deleted the file this time
2009-10-22 15:59:37 -07:00
Mark Palange (Mani)
52253a7fa3
merge
2009-10-22 15:42:08 -07:00
James Cook
3431664430
Moved internal LLSideTrayTab class to .cpp file, de-inline param block constructor, not reviewed
2009-10-22 15:40:59 -07:00