6bc63bddee
merge changes for new search
2011-05-31 22:29:28 -04:00
97f744f251
Added tag 2.7.1-start for changeset 54fd44ac92e4
2011-05-27 18:22:47 -04:00
0c360c5223
merge changes for storm-1210
2011-05-27 15:33:46 -04:00
170de8330e
Added newline at end of header file to fix linux build.
2011-05-26 18:05:29 -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
66399cc9cc
FIX INTL-47 Japanese and Italian translation for set19-23, light set1-2
2011-05-26 15:47:49 -07:00
f92b46f7a0
FIX DA hardware setting UI, en_xui_change
2011-05-26 15:04:14 -07: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
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
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
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
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
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
03ba07008c
Added tag DRTVWR-54_2.6.8-release, 2.6.8-release for changeset be2000b946f8
2011-05-24 17:19:42 -04:00
8d5a9f9d2d
merge changes for STORM-1277
2011-05-24 12:08:22 -04:00
00ad0c4253
merge up to latest viewer-development with mesh changes
2011-05-24 11:57:35 -04:00
fb259b9788
fix VWR-25036
2011-05-23 18:08:43 -07:00
49e44dd299
FIX VWR-25029
2011-05-23 17:58:01 -07:00
413d215d7f
FIX VWR-25028
2011-05-23 17:41:48 -07:00
4719cb1efe
FIX VWR-25027
2011-05-23 17:33:52 -07:00
f4bee7d771
FIX VWR-25025 en_xui_change
2011-05-23 16:06:24 -07:00
de9d7d59b1
FIX VWR-25024 en_xui_change
2011-05-23 14:06:44 -07:00
c4d9d061f3
FIX VWR-25023 en_xui_change
2011-05-23 14:05:10 -07:00
f94d824e3d
FIX VWR-25022 en_xui_change
2011-05-23 14:03:48 -07:00
b165e5ad4a
FIX VWR-24753
2011-05-23 14:00:15 -07:00
0ef1364063
STORM-1275 FIX viewer gets caught in infinite loop for decompstub
...
Fixed setting the initialized flag for the decomposition stub case
(for OS builds) so that the viewer doesn't hang when initializing the stub.
Note that initialized will be set to true even when instance will return NULL.
2011-05-23 16:56:06 -04:00
57a19cf194
FIX VWR-25016 en_xui_change
2011-05-23 13:54:52 -07:00
e4467e9964
sync with viewer-development
2011-05-23 10:58:41 -07:00
294c5f3d3a
SH-1616 FIX SL client crashes on startup for debug builds
...
Added more NULL checks for llconvexdecompositionstub, to avoid
crashing. Clients won't be able to upload meshes using the stub,
but should be able to run the client otherwise.
2011-05-23 12:15:04 -04:00
e5752934be
increment viewer version to 2.7.1
2011-05-23 09:16:40 -04:00
f64be5215d
Added tag 2.7.0-start for changeset 8835e0e3c0d3
2011-05-23 09:16:01 -04:00
8f7c287365
merge changes for beta branch tags
2011-05-20 22:51:11 -04:00
7ef5a015de
correct license headers
2011-05-20 17:21:44 -04:00
ecafe4d8ab
fix more DOS line endings
2011-05-20 17:19:03 -04:00
708b2974a9
merge changes for sh-1591
2011-05-20 17:14:32 -04:00
Oz Linden