7f1c2b6db8
merge
2010-08-06 11:50:04 -07:00
7b41819377
removed spurious parsing of empty text contents
2010-08-06 11:49:43 -07:00
5866710be7
fixed crash on entering build mode
2010-08-06 11:03:28 -07:00
9609b2c81c
renamed LLFastXUIParser to LLSimpleXUIParser and added support for parsing xml node text contents
2010-08-06 11:03:15 -07:00
60a313a687
speed up population of region scripts list
2010-08-06 11:02:37 -07:00
a974ed98d0
Fix for a crash on startup.
...
Richard sent me the diff for this one, just pushing it on his behalf.
2010-08-05 14:18:55 -07:00
d26e380a06
added newlines at end to make Linux builds happy
2010-08-05 13:19:19 -07:00
9f220e46e5
merge
2010-08-05 13:18:11 -07:00
52936c4ffe
reverted unportable use of typeinfo* as hash key
2010-08-05 13:15:22 -07:00
5e56b2d4ac
merge
2010-08-05 11:19:42 -07:00
d4668787ad
Allow targeted links in the embedded browser to open multiple media browser windows.
...
Added an optional "target" parameter" to LLWeb::loadURL and loadInternal.
Made LLViewerMediaImpl::handleMediaEvent pass the target attribute of clicked links through.
Set floater_media_browser.xml to allow multiple instances.
Added LLFloaterMediaBrowser::create() and made LLFloaterMediaBrowser assume the incoming tag is the window's target, not the URL.
Reviewed by Richard at http://codereview.lindenlab.com/2641050
2010-08-05 11:16:13 -07:00
d042dd9598
Yet another new Mac build of llqtwebkit.
...
Built from the following:
revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision bac00603b761 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the default branch)
2010-08-05 11:01:59 -07:00
b2028085fd
first pass at faster XUI parsing (no recursion support yet)
...
also made LLSD->param block parsing faster
2010-08-04 19:02:30 -07:00
f92a411c02
updated comment on boost lib
2010-08-04 19:01:55 -07:00
b3bf2d7933
optimized LLUIString construction
2010-08-04 19:01:44 -07:00
932f248553
optimized font lookups
2010-08-04 19:01:28 -07:00
5062351a0a
deprecated ADD_SORTED due to n^2 behavior, set the sort order on the scroll list instead
2010-08-04 19:01:18 -07:00
bab6e11eef
New Mac build of llqtwebkit, to fix a problem with named link targets and onClickLinkHref events.
...
Built from the following:
revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 08e0bc3253b7 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the default branch)
2010-08-03 16:43:23 -07:00
c89ff6e80b
merge from PE's viewer-trunk
2010-08-03 13:35:33 +01:00
332cf3d32a
merge from viewer-release
2010-08-03 13:33:55 +01:00
4f2641aef0
merge from PE's viewer-release
2010-08-03 13:33:06 +01:00
d10b9a7f37
Pulled from "dessie/viewer-release"
2010-08-02 22:05:56 -07:00
39965cf6e8
merge from dessie/viewer-release
2010-08-02 19:45:35 -07:00
df5d5b8414
EXT-8545 FIX Button art and other images are positioned incorrectly when UI scale != 1.0
2010-08-02 18:54:31 -07:00
b3b8ef25e1
Eliminate the bad merge at "2026f824953f"
2010-08-02 17:03:55 -07:00
6a1fefac22
Redo the same merge as in changeset "2026f824953f", but this time with feeeeling.
2010-08-02 16:59:20 -07:00
4f6e814eaa
Fix the reversion imported from viewer-hotfix via: "hg pull -r 1c95812ba38b ../viewer-public" - reviewed by richard
2010-08-02 15:57:01 -07:00
bd20eddd4e
EXT-8540 - Implement mime type override for web_browser ctrl
...
reviewed by Monroe
2010-08-02 14:52:09 -07:00
dd6d7dde7e
Fixed build (unit tests linking errors).
...
--HG--
branch : product-engine
2010-08-02 22:26:49 +03:00
a39b31abf8
CT-575 WIP FR PT linguistic
2010-08-02 10:52:35 -07:00
e5b33c31c3
EXT-7676 FIXED Restored fix (47df1b3fd94e) reverted in merge 5b5cc4a8642d with slight modifications.
...
- Replaced pointers passed to 'Add More' gear menu with LLHandle.
- Removed storing 'Add More' panel sort order from settings because the order is changed each time the panel opens.
- Replaced creating items comparator in LLPanelOutfitEdit::postBuild() with a static comparator in llwearableitemslist.cpp.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/826/ .
--HG--
branch : product-engine
2010-08-02 20:52:17 +03:00
713417aeeb
EXT-5609 FIXED Avoided showing script floater undocked if it was created in mouselook mode.
...
Commiting on behalf of Alex Productengine.
- Added check if floater is constructed in mouselook mode and added forcing dock state when floater is shown after constructing in mouselook mode.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/830/
--HG--
branch : product-engine
2010-08-02 21:00:02 +03:00
367428e09e
Manual merge from default branch. Resolved conflicts in indra/newview/llfloatercamera.cpp.
...
--HG--
branch : product-engine
2010-08-02 19:46:42 +03:00
b12201bf01
EXT-6542 Localized the "none/none" in the About land floater.
...
This is an additional fix to the one made in rev. 6788ff579917.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/828/
--HG--
branch : product-engine
2010-08-02 19:04:32 +03:00
3b7da51117
Merge from default branch
...
--HG--
branch : product-engine
2010-08-02 18:59:35 +03:00
f423a69864
Merge.
2010-07-30 22:43:15 -04:00
3c27e119b4
fixed windows build
2010-07-30 17:45:13 -07:00
8aac492b6a
merge
2010-07-30 17:41:55 -07:00
cba6943b27
optimizations in button rendering
2010-07-30 17:41:41 -07:00
08f13801d2
Automated merge with ssh://richard@hg.lindenlab.com/dessie/viewer-public
2010-07-30 17:33:50 -07:00
52a39060c7
fix for mac
2010-07-30 17:33:41 -07:00
e56a0dfd28
Fix mac build.
2010-07-30 17:33:00 -07:00
c0819d7998
fix for mac build
2010-07-30 17:30:53 -07:00
6833a97c94
Fix for EXT-8533
...
When sending the MIME type probe, tell LLCurl to allow cookies in the response. This works around an issue with some sites that will get into an infinite redirect loop when cookies are disabled.
2010-07-30 17:13:27 -07:00
d109457311
Upgraded NVIDIA 120 and 220 to class 1. They're performing too well.
2010-07-30 16:21:21 -07:00
8181739471
fixed windows build
2010-07-30 16:07:08 -07:00
170c7b56a8
merge
2010-07-30 15:17:50 -07:00
d72a21aca1
further UI rendering performance improvements
2010-07-30 15:17:32 -07:00
84a9e0abd8
Fix for EXT-8339
...
Added a couple of new nav states to LLViewerMediaImpl: MEDIANAVSTATE_FIRST_LOCATION_CHANGED_SPURIOUS and MEDIANAVSTATE_COMPLETE_BEFORE_LOCATION_CHANGED_SPURIOUS. These behave just like the corresponding states without the _SPURIOUS suffix, but will be used if the new navigate doesn't change the current URL of the impl. This allows us to catch cases like the repro of this issue and discard the spurious navigate events.
2010-07-30 13:51:37 -07:00
0847d29e0a
fix for DEV-52379 (viewer is not successfully caching object goemetry)
...
There was a typo between the files saved and those loaded.
saved in sobjects_gridx_gridy.slc bload loaded from objects_gridx_gridy.slc
Q will review later ;-)
2010-07-30 13:32:07 -07:00
Richard Nelson