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
385b1ca609
FIX VWR-25021
2011-05-19 16:54:21 -07:00
6ea0e25d3b
FIX VWR-25020
2011-05-19 16:53:23 -07:00
358d5e96a2
FIX VWR-25019
2011-05-19 16:52:46 -07:00
a76afb5026
WIP VWR-25018
2011-05-19 16:52:08 -07:00
19a1e6f9db
FIX VWR-25017 en_xui_change
2011-05-19 16:50:26 -07:00
42256dcf51
FIX VWR-25015
2011-05-19 16:49:33 -07:00
26041278ac
FIX VWR-25011 en_xui_change
2011-05-19 16:46:01 -07:00
2ba00f4317
FIX VWR-25010 en_xui_change
2011-05-19 16:44:42 -07:00
5dee1ef57e
FIX VWR-25009
2011-05-19 16:43:30 -07:00
a1868f841b
FIX VWR-24161 en_xui_change
2011-05-19 16:38:48 -07:00
ce248b92d7
merging head 58e0f8f72d39
2011-05-19 14:42:42 -04:00
541d6930b5
merging head 7d0ac62a9c94
2011-05-19 14:42:13 -04:00
1f15b3bdae
increment viewer version to 2.7.0
2011-05-19 13:37:42 -04:00
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
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
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
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
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
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
55665d99a4
un-hardcode the viewer name merged in from the mesh branch
2011-05-17 16:54:51 -04:00
4d6f2dca42
Undo installer text change
2011-05-17 12:00:29 -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
79459bc9ba
Restore reference to $last_built_variant when computing path to the Windows Installer
2011-05-17 11:06:33 -04:00
8721ba77c0
STORM-1032 FIXED Artwork update for Appearance Editor "Edit" icon
...
- Replaced old edit icon with the new one
2011-05-17 17:55:04 +03:00
6c61e85fc4
VWR-22299 Error strings for login failure conditions
2011-05-16 14:14:24 -07:00
26f321bf65
merge
2011-05-16 16:11:56 -05:00
4d2a64c4a4
STORM-1259 Sculpt dimension meta-data view missing from 2.x, was possible to see in 1.23
2011-05-16 16:34:26 -04:00
113f532ee5
Added tag 2.6.9-start for changeset e67da2c6e312
2011-05-16 14:57:22 -04:00
92426cce0c
remove new search in favor of moving to a project viewer
2011-05-16 14:57:15 -04:00
6ddd79be06
Added tag 2.6.9-start for changeset 11d5d8080e67
2011-05-16 14:55:34 -04:00
Oz Linden