fd427f0ab9
merge changes for storm-1100
2011-05-19 12:26:57 -04:00
78cad51818
merge changes for STORM-1259 and STORM-1175
2011-05-19 12:07:41 -04:00
196b4d5704
merge changes for storm-1032
2011-05-19 12:05:34 -04:00
f10384d014
merge changes for storm-941
2011-05-19 11:48:48 -04:00
eb8f5d843f
storm-1267
2011-05-18 18:27:17 -04:00
c351b94723
merge changes for login-messages
2011-05-18 18:26:19 -04:00
35f394cd63
merge changes for storm-859
2011-05-18 18:24:13 -04:00
66554e2124
merge
2011-05-18 15:56:41 -04:00
c84e84cfbf
Fix for sh-1227. Decoupled avatar in preview window from in world avatar. Code cleanup.
2011-05-18 15:56:24 -04:00
2414417210
Automated merge with http://hg.secondlife.com/viewer-development
2011-05-18 15:33:17 -04:00
03f7063c0b
merge
2011-05-18 13:58:29 -05:00
63118cacad
Remove extraneous width declaration at behest of eli.
2011-05-18 13:58:12 -05:00
ce554304fb
fix for SH-1591: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138
2011-05-18 11:46:55 -06:00
e5e98a597d
Reverted Linux LLQtWebKit to older version which triggered warnings here that are treated as errors.
2011-05-18 09:56:02 -07:00
3990324e8f
trying to fix mac build complaints
2011-05-18 11:33:28 -04:00
a461aedf2e
merge latest updates from viewer-development
2011-05-18 09:52:20 -04:00
a44a414238
merge changes for storm-941
2011-05-18 09:49:24 -04:00
7713a84777
merge changes for storm-1175
2011-05-18 09:48:46 -04:00
6f2e77522a
merge
2011-05-18 09:48:20 -04:00
7a02501aae
SH-1492 WIP
2011-05-18 09:47:58 -04:00
536bc21dac
merge changes for storm-1032
2011-05-18 09:46:57 -04:00
2de13f8070
merge changes for storm-1259
2011-05-18 09:46:28 -04:00
5eb6cb8d86
merge up latest viewer-development (post mesh)
2011-05-18 07:33:08 -04:00
4374f53e23
SH-1586 Fix for bad camera behavior introduced by SH-1119
2011-05-18 02:02:52 -05:00
e237f5733c
SH-914 Fix for normals getting screwed up by non-uniform model normalization.
2011-05-18 01:30:21 -05:00
f9ac182865
SH-1555 Disable upload button if a hull exists that has more than 256 vertices.
2011-05-17 23:47:29 -05:00
42654e759e
Replace older (but working) reference to version of LLQtWebKit for Linux
2011-05-17 17:47:06 -07:00
8f8f5b29b5
merge
2011-05-17 19:50:47 -04:00
644cbc4487
merge notifications.xml fix
2011-05-17 19:29:45 -04:00
9075e1104f
fix merge error in open source configurations to disable proprietary components
2011-05-17 19:26:18 -04:00
fe22feea99
remove junk from after close tag
2011-05-17 19:25:37 -04:00
4297b530d3
Merge cleanup
2011-05-17 18:25:33 -05:00
cb936d097f
pull back fix for STORM-1260 from beta branch
2011-05-17 18:47:51 -04:00
d8183a71d4
SH-1580 FIXED Disable mesh mirroring in build tools & on server
2011-05-17 18:18:10 -04:00
bd37b14e92
BUILDFIX: copy/paste error in mesh autobuild.xml causes configure to fail.
...
copy/paste error in autobuild.xml caused INSTALL_PROPRIETARY to be set to TRUE
for OS builds. This causes configure to fail as llconvexdecomposition is not
available to OS devs. Changing INSTALL_PROPRIETARY to false for OS devs so
that llconvexdecompositionstub is used instead. problem only affects windows
builds.
2011-05-17 17:25:38 -04:00
0a86e39d90
Merge with viewer-development (mesh)
2011-05-17 21:01:36 +00:00
55665d99a4
un-hardcode the viewer name merged in from the mesh branch
2011-05-17 16:54:51 -04:00
ae8ed3fc2d
Merge with viewer-development
2011-05-17 19:21:55 +00:00
4d6f2dca42
Undo installer text change
2011-05-17 12:00:29 -07:00
6898b2c6d5
merge
2011-05-17 12:46:52 -05:00
01e98f535e
STORM-1260 FIXED Replaced llerrs messages with llwarns in directory iterator code to avoid viewer halt when a cache dir is not found.
2011-05-17 20:22:46 +03:00
9aef66cfcc
changing URL to support SSL
2011-05-23 12:49:19 -07:00
32313dd3c6
STORM-1260 FIXED Replaced llerrs messages with llwarns in directory iterator code to avoid viewer halt when a cache dir is not found.
2011-05-17 20:22:46 +03:00
465072626e
Typo in Mac/Darwin LLQtWebkit archive name
2011-05-17 10:05:49 -07:00
d2c697832f
Point to updated (working) builds of LLQtWebKit.
...
Windows one was missing debug libs/dlls
Mac one was missing updated exports.
Linux one included for completeness.
2011-05-17 09:31:43 -07:00
20a48876d0
VWR-25654 FOLLOWUP made temporary string variable const
2011-05-17 17:50:12 +02:00
79459bc9ba
Restore reference to $last_built_variant when computing path to the Windows Installer
2011-05-17 11:06:33 -04:00
90ac5f839f
SH-769 FIXED Name field in upload model dialog allows 255 characters...
2011-05-17 11:02:28 -04:00
b714ecafbe
SH-1506 FIXED "Upload Wizard" is missing from Inventory's add menu
2011-05-17 10:58:42 -04:00
7e977d05f2
SH-1444 FIXED "Allow mesh objects" setting is visible on a non-mesh region.
2011-05-17 10:58:21 -04:00
Oz Linden