7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
04425000ae
STORM-294 : merge to viewer-development
2010-10-19 16:23:14 -07:00
c1c087b508
Added tag 2.2.0-release for changeset 1415e6538d54
2010-10-19 13:41:58 -07:00
e2d8eac19e
Pulled 2.2.0-release tag from viewer-release
2010-10-19 13:41:14 -07:00
e8a4b9308a
Tagging for pull to beta branch.
2010-10-19 15:33:21 -04:00
0682e10532
merge
2010-10-19 14:16:57 -05:00
9db8e12f33
CTS-283 Fix for objects being locked when imported.
2010-10-19 14:16:24 -05:00
8d8860d5b2
Make preview render match what will be uploaded (exposes transform changes between LODs)
2010-10-19 14:16:00 -05:00
256c6e6a25
Moved retry logic for certain mesh header fetches to help with SH-323 'Some mesh objects fail to load data for valid meshes'. Renamed some variables to be more clear.
2010-10-19 11:29:42 -07:00
c683151587
automated merge
2010-10-18 17:27:48 -07:00
a045261002
merge
2010-10-18 17:48:14 -05:00
189b71699f
Turn assertion around cache loading into an early out.
2010-10-18 17:45:55 -05:00
a3c84b5c58
Improved locking around command queues.
2010-10-18 17:45:25 -05:00
500e8f2376
SH-329 SH-332 WIP BUILDFIX update linux colladadom
...
Verified my fix actually removes dependency on GLIBC 2.4 this time.
Sorry for thrashing on install.xml :)
2010-10-18 18:04:09 -04:00
869438e6cd
Point the events profiles and other components to the new events
...
web pages
2010-10-18 10:37:21 -07:00
4dc9875310
SH-329 SH-332 WIP update colladadom to work on linux
...
Trying again, this time with proper build flags so we don't run into
versioning issues, since the lib is built on ubuntu but has to link
on an older build machine
2010-10-18 13:30:43 -04:00
83677753bb
SH-332 SH-329 update colladadom for open source release
...
Trying to repackage colladadom for linux as static linking, test
impact on unresolved dependencies.
2010-10-18 12:29:32 -04:00
028bb02a6b
Better physics shape display.
2010-10-16 04:02:52 -05:00
18ade97fa6
Automated merge with file:///Users/oz/Work/viewer-development
2010-10-15 22:19:57 -04:00
22edf673cf
merge
2010-10-15 19:51:28 -05:00
12bd7a40d6
Update llconvexdecomp
2010-10-15 19:51:00 -05:00
f670360d45
SH-329 WIP get branch ready for open source release
...
updated build config to strip havok debug symbols
also added mac convex decomp stub lib.
2010-10-15 19:29:31 -04:00
75c8a1c995
SH-331 SH-332 FIX SH-329 WIP fix: colladadom for mac/linux wip: decompstub
...
updating install.xml with the new packages for colladadom for mac & linux
updating install.xml with decomposition stub for linux (mac and win will come later)
2010-10-15 18:48:22 -04:00
084cee21ca
automated merge
2010-10-15 15:01:59 -07:00
997d66d348
Fix for various crashes on exit and leaks when using convex decomposition.
...
Make rendering of convex hullified prims work in physics shape display.
Reviewed by Falcon.
2010-10-15 16:33:22 -05:00
ba2300b8ae
pull fix for STORM-211
2010-10-15 16:41:30 -04:00
1832175629
pull fix for STORM-279
2010-10-15 16:40:24 -04:00
dd69516213
pull fix for STORM-376
2010-10-15 16:38:42 -04:00
6fc3de7b2d
Merge
2010-10-15 13:36:10 -07:00
f34dbf937d
automated merge
2010-10-15 13:35:57 -07:00
068e3cc469
pull fix for STORM-304 / STORM-386
2010-10-15 16:35:39 -04:00
b0fd7bf7ea
fixing ims not logging with display names off
2010-10-15 13:32:31 -07:00
70a98095c0
CTS-265 Fix for spinners having a scale limit of 10m
2010-10-15 14:12:52 -05:00
dcb43490a5
Proper loading of hull indices, bad use of initThread
2010-10-15 14:04:26 -05:00
2357233ab6
SH-338 Fix for crash when setting medium LOD to none.
2010-10-15 14:04:13 -05:00
8766f321d8
automated merge
2010-10-15 11:31:39 -07:00
e748167abf
STORM-386 FIXED Disabled higlighting URLs in object names inside the "<name> has said something new" textbox that pops up in NEARBY CHAT window.
2010-10-15 16:24:37 +03:00
8158c5637a
Automated merge with file:///Users/oz/Work/viewer-development
2010-10-15 08:37:31 -04:00
508686047d
Merge from http://hg.secondlife.com/viewer-identity (display names)
2010-10-14 14:03:16 -07:00
8163cd9e6f
merge
2010-10-14 15:38:02 -05:00
e5943ac8d1
SH-324 Clamp models to 64m on upload.
2010-10-14 15:36:49 -05:00
f53f6f20df
DN-174Some length of Display Name (username) can cause the name to disappear off of the Buy object floater
2010-10-14 13:20:43 -07:00
952340c227
merge up to latest viewer-development
2010-10-14 15:52:11 -04:00
b049db546a
DN-177 Cannot click on Name in Friend Request to view profile - and no profile pic in friend request
2010-10-14 12:01:40 -07:00
d4361230cd
automated merge
2010-10-14 12:00:27 -07:00
0c551bd3c8
SH-329 WIP merging in oz's fix for license issues in the mesh branch
2010-10-14 14:53:28 -04:00
2303ec6213
merge fix for STORM-367
2010-10-14 14:16:35 -04:00
ac3f7c2b6b
Automated merge with file:///Users/oz/Work/viewer-beta
2010-10-14 14:13:30 -04:00
a63b837751
pull late fixes from beta
2010-10-14 14:07:57 -04:00
c322a29752
merge old 2.1.1-release head that was lying around
2010-10-14 14:05:14 -04:00
Loren Shih