Melanie
05d2302c62
Merge branch 'dev-appearance'
2010-10-29 20:24:14 +01:00
Melanie
e6fe83cd93
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This work conflicts with cmickeyb's more extensive, related work
This reverts commit 9c829c0410
.
2010-10-29 20:17:59 +01:00
opensim mirror account
448b83b105
Merge branch 'master' of /var/git/opensim/
2010-10-29 11:50:10 -07:00
Melanie
9c829c0410
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:58:22 +01:00
opensim mirror account
8b867ba23e
Merge branch 'master' of /var/git/opensim/
2010-10-28 17:40:06 -07:00
Marck
7b0d643999
HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with linked regions.
...
* Added check for already occupied region coordinates.
* Optimized Check4096.
2010-10-28 17:21:17 -07:00
Master ScienceSim
68666efd25
Configuration of persistent baked textures and save/send delays.
2010-10-28 12:00:04 -07:00
Master ScienceSim
f2c1d0e34f
Merge branch 'opensim-master' into dev-appearance
2010-10-28 09:09:42 -07:00
Master ScienceSim
0f28fa400d
Added background thread to handle delayed send and save of appearance
...
to accommodate batching of the many updates that happen on login
and teleport.
Fixed handling of the serial property in appearance.
2010-10-28 09:00:39 -07:00
opensim mirror account
71d9fac757
Merge branch 'master' of /var/git/opensim/
2010-10-27 21:40:03 -07:00
Jeff Ames
727838f914
Formatting cleanup.
2010-10-28 00:37:32 -04:00
opensim mirror account
0269ec6af0
Merge branch 'master' of /var/git/opensim/
2010-10-27 13:40:10 -07:00
Melanie
1fcac7203d
Prevent nullrefs in scene object deletion. Mantis #5156
2010-10-27 20:47:27 +01:00
opensim mirror account
6f297a50cb
Merge branch 'master' of /var/git/opensim/
2010-10-26 21:30:05 -07:00
dahlia
a4e95c0717
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-26 21:20:18 -07:00
dahlia
5968d343bb
Overload Scene.NewUserConnection() to facilitate NPCs and other region specific applications
2010-10-26 21:19:33 -07:00
opensim mirror account
d6771ed4d5
Merge branch 'master' of /var/git/opensim/
2010-10-26 21:10:12 -07:00
Jeff Ames
a331fd4e24
Formatting cleanup.
2010-10-27 00:01:03 -04:00
Master ScienceSim
9cfd3e1d5a
Small cleanup and add more debugging information
2010-10-26 12:54:28 -07:00
Master ScienceSim
9132e251aa
Made the check for texture assets asynchronous. This is one part of
...
a bigger clean up that needs to happen around locks on appearance.
2010-10-26 12:53:15 -07:00
Jonathan Freedman
5da2743c37
Merge branch 'master' into mantis5110
2010-10-25 22:27:35 -04:00
Master ScienceSim
6e58c3d563
Half of the compatibility is working. Login into a new region with
...
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
2010-10-25 14:11:47 -07:00
Mic Bowman
657cceb884
Intermediate commit for backward compatability; does not compile yet
2010-10-25 09:42:28 -07:00
opensim mirror account
a2c0ee8da7
Merge branch 'master' of /var/git/opensim/
2010-10-24 16:40:06 -07:00
Latif Khalifa
c74c1620a1
* Updated libomv to r3461
...
Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
2010-10-24 23:51:46 +01:00
Jonathan Freedman
07db35697b
Merge branch 'master' into mantis5110
2010-10-24 15:01:01 -04:00
Jonathan Freedman
ba9ef44506
Merge branch 'master' into mantis5110
2010-10-24 15:00:24 -04:00
Jonathan Freedman
6b9660eb96
Merge branch 'master' into mantis5110
2010-10-24 14:51:38 -04:00
opensim mirror account
17d3c76116
Merge branch 'master' of /var/git/opensim/
2010-10-24 11:10:07 -07:00
Jonathan Freedman
3fe8fc3d51
* throw debug message when no HomeURI is set
2010-10-24 13:32:34 -04:00
Melanie
852c61aaa6
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:17:21 +01:00
opensim mirror account
c83453a69b
Merge branch 'master' of /var/git/opensim/
2010-10-23 20:40:07 -07:00
Diva Canto
627d1a42fe
Added inner exception handling in Shape deserialization processing, so that the whole Shape processing returns a valid Shape object.
2010-10-23 20:39:41 -07:00
Jonathan Freedman
5ddb8b535e
* a bit of additional debugging:
2010-10-23 00:18:19 -04:00
opensim mirror account
bf5cc32b5f
Merge branch 'master' of /var/git/opensim/
2010-10-22 16:00:06 -07:00
Justin Clark-Casey (justincc)
80f90229e5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-22 23:56:58 +01:00
Justin Clark-Casey (justincc)
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e
, reversing
changes made to 8f34e46d74
.
2010-10-22 23:52:07 +01:00
opensim mirror account
566b96a595
Merge branch 'master' of /var/git/opensim/
2010-10-22 15:50:09 -07:00
opensim mirror account
cc411bf5f3
Merge branch 'master' of /var/git/opensim/
2010-10-22 15:40:08 -07:00
Justin Clark-Casey (justincc)
21187f459e
Merge remote branch 'otakup0pe/mantis5110'
2010-10-22 23:35:07 +01:00
Justin Clark-Casey (justincc)
8f34e46d74
Revert "* refactor refactor refactor ServerURI 4 lyfe"
...
This reverts commit 55974df14b
.
2010-10-22 23:35:01 +01:00
Justin Clark-Casey (justincc)
783b1b548f
Revert "* additional serveruri cleanup"
...
This reverts commit 19119d7705
.
2010-10-22 23:34:53 +01:00
Jonathan Freedman
38e76d71ac
Merge branch 'hg16' into mantis5110
2010-10-22 18:34:50 -04:00
Justin Clark-Casey (justincc)
a490b34b6e
Revert "* more url / hg cleanup"
...
This reverts commit 58f75fa19d
.
2010-10-22 23:34:44 +01:00
Justin Clark-Casey (justincc)
cddcb53b17
Revert "* remove some spurious debug info"
...
This reverts commit 017b83d0a3
.
2010-10-22 23:34:37 +01:00
Justin Clark-Casey (justincc)
d58967be58
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
...
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
2010-10-22 18:33:59 -04:00
Justin Clark-Casey (justincc)
6d7ce63085
Allow OARs and IARs to save and load meshes.
...
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem. Needs more investigation.
2010-10-22 18:33:55 -04:00
Justin Clark-Casey (justincc)
a7a8fdc7da
print IAR version number on console when saving
2010-10-22 18:33:52 -04:00
Justin Clark-Casey (justincc)
bdd6857006
Implement guard against trying to load incompatible version IARs
2010-10-22 18:33:47 -04:00
Justin Clark-Casey (justincc)
607c07b4aa
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 18:33:41 -04:00