5c3bde9eb3
Merge
2011-05-27 15:36:30 -04:00
45c8e9bd9a
Removed unneeded platform directory delimeter lookups in llvocache.cpp
2011-05-27 15:34:40 -04:00
0c360c5223
merge changes for storm-1210
2011-05-27 15:33:46 -04:00
394811cff5
Merge with viewer-development.
2011-05-27 14:16:52 -04:00
c203702459
VWR-25861 VWR-25862 Removed LLDir_Mac::deleteFilesInDir() virtual method.
...
The LLDir base class method will now be used instead. The handling of the mask
parameter was inconsistent between the two implementations, and the failure
to remove the old method was probably just an oversight.
2011-05-27 12:55:31 -04:00
1eb265e059
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-05-26 22:47:40 -07:00
66399cc9cc
FIX INTL-47 Japanese and Italian translation for set19-23, light set1-2
2011-05-26 15:47:49 -07:00
d5f96c38e6
merge from viewer-pre-beta
2011-05-26 18:34:41 -04:00
4b7793a119
Added tag DRTVWR-59_2.7.0-beta1, 2.7.0-beta1 for changeset 43c7ee846b7e
2011-05-26 18:31:29 -04:00
170de8330e
Added newline at end of header file to fix linux build.
2011-05-26 18:05:29 -04:00
f92b46f7a0
FIX DA hardware setting UI, en_xui_change
2011-05-26 15:04:14 -07:00
ecd0cc3a5a
EXP-772: If URIs returned by SRV fail, fall back on original URI.
2011-05-26 17:25:26 -04:00
7a7a0f0c1b
EXP-772: If URIs returned by SRV fail, fall back on original URI.
2011-05-26 17:25:26 -04:00
d64babaeeb
STORM-1286 - merge changes for SH-1624
2011-05-27 12:28:42 -04:00
ac9928918d
STORM-1290 - merge changes for INTL-47
2011-05-27 11:52:47 -04:00
7c042e1bcd
SH-1467 WIP Viewer checks the wrong cap for mesh-ui disable
...
Fixes that need to go into trunk because certain Mesh UI elements are showing up on DRTSIM-52. These fixes will probably be overwritten by the actual resolution of SH-1467 but I need this workaround now.
2011-05-26 16:58:31 -04:00
5a39eeb70f
SH-1669 FIXED Physics properties show up on DRTSIM-52
2011-05-26 16:52:26 -04:00
74da6623dc
SH-1668 FIXED Cubes can be scaled to 64^3
2011-05-26 16:48:15 -04:00
d5ae682e11
SH-1444 FIXED "Allow mesh objects" setting is visible on non-mesh region.
2011-05-26 16:04:36 -04:00
4cd295badd
Updated links to new version of LLQtWebKit package for Mac with valid exports file.
...
Addition of Windows version for completenes. No changes.
2011-05-26 12:42:19 -07:00
303a59e7bc
dos2unix fixes for newview files.
2011-05-26 14:16:56 -04:00
cb3875fe72
SH-1527 FIXED Fix for black alpha objects with lighting and shadows enabled and no lights around.
2011-05-26 12:00:58 -04:00
dc9aa56f66
STORM-1283 - merge changes for VWR-25039, VWR-25044, VWR-25052, INTL-46
2011-05-26 11:40:25 -04:00
2595d53ded
Automated merge with http://hg.secondlife.com/viewer-development
2011-05-25 18:14:55 -07:00
55a9991812
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-05-25 18:11:50 -07:00
a8405dea54
EXP-829 FIX Text Box Alignment bug
...
EXP-755 FIX [PUBLIC] 'Search' and 'World Map' links in Sidebar are unclickable
fixed issues with UI scaling and text layout as well as incorrect text editor rect transforms
reviewed by Callum
2011-05-25 18:10:58 -07:00
e6ecf1ee7e
Replaced my test page with more generic URL for Web floater test at login page
2011-05-25 18:00:46 -07:00
fede6c4493
Merge
2011-05-25 14:44:52 -06:00
8c97ed86ff
fix for SH-1624: Crash during viewer startup: LLViewerTextureList::addImageToList
2011-05-25 14:38:53 -06:00
fda331bb80
merge STORM-1275
2011-05-25 15:56:59 -04:00
57bdcd6bda
VWR-25862 Potential fix for caches not clearing when they are supposed to.
...
* Removed leading delimiter from filename mask in all calls to
LLDir::deleteFilesInDir() that are related to the viewer asset caches
(texture, VFS, and VO).
2011-05-25 15:44:03 -04:00
163c2c52aa
WIP INTL-46 partial traditional chinese translation
2011-05-25 12:39:44 -07:00
23470d252c
FIX VWR-25052 en_xui_change
2011-05-25 11:54:47 -07:00
30b9984549
FIX VWR-25044
2011-05-25 11:54:03 -07:00
a0af5e972a
FIX VWR-25039 en_xui_change
2011-05-25 11:53:02 -07:00
9d0c4177b2
merge
2011-05-25 14:46:53 -04:00
e5ca2b4b82
merge
2011-05-25 11:26:08 -07:00
f8907b327b
hooking up marketplace inbox to inventory
2011-05-25 11:17:47 -07:00
33e4a2c7b1
Updated Marketplace Inbox & Outbox panel to maintain size when one is expanded vs the other
2011-05-25 10:39:34 -07:00
610b15aee4
Updated badge to different art that is opaque
2011-05-25 10:30:44 -07:00
ae6ceb6193
Point to updated version of LLQtWebKit that supports local changes.,
2011-05-25 10:19:00 -07:00
e9f8a5441b
Added support for pushing agent global location on grid and agent orientation out to LLQtWebKit
2011-05-25 08:10:04 -07:00
126965e486
merged .hgtags back from viewer-release
2011-05-24 18:40:50 -04:00
9afa752ca1
merged .hgtags
2011-05-24 18:39:19 -04:00
00beffb7a7
merged .hgtags back from viewer-release
2011-05-24 18:05:09 -04:00
84202f19a5
merged .hgtags back from viewer-release
2011-05-24 18:03:43 -04:00
6c5ecf260e
Added tag DRTVWR-46_2.6.3-release, 2.6.3-release for changeset 8f2da1701c81
2011-05-24 17:35:49 -04:00
1b38f61061
Added tag DRTVWR-51_2.6.6-release, 2.6.6-release for changeset dac76a711da5
2011-05-24 17:34:56 -04:00
d6f7526abf
Merge
2011-05-24 14:28:25 -07:00
03ba07008c
Added tag DRTVWR-54_2.6.8-release, 2.6.8-release for changeset be2000b946f8
2011-05-24 17:19:42 -04:00
Logan Dethrow