934e536738
Merge commit 'cmickeyb/dev-appearance'
2010-10-29 21:06:46 +01:00
49fa7e91b9
Clean up some cruft from the last commit. Re-add the initial update
...
send in the scene presence constructor... need to figure this out
later.
2010-10-29 13:45:59 -07:00
f5c9a56c8b
Bunch of fixes that reduce the number of times appearance
...
and avatar data are sent. And the number of times they
are stored.
2010-10-29 13:43:35 -07:00
5f4badf9e2
Add my work on top of cmickeyb's
2010-10-29 20:44:29 +01:00
05d2302c62
Merge branch 'dev-appearance'
2010-10-29 20:24:14 +01:00
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
448b83b105
Merge branch 'master' of /var/git/opensim/
2010-10-29 11:50:10 -07:00
9c829c0410
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:58:22 +01:00
8b867ba23e
Merge branch 'master' of /var/git/opensim/
2010-10-28 17:40:06 -07:00
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
68666efd25
Configuration of persistent baked textures and save/send delays.
2010-10-28 12:00:04 -07:00
f2c1d0e34f
Merge branch 'opensim-master' into dev-appearance
2010-10-28 09:09:42 -07:00
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
71d9fac757
Merge branch 'master' of /var/git/opensim/
2010-10-27 21:40:03 -07:00
727838f914
Formatting cleanup.
2010-10-28 00:37:32 -04:00
0269ec6af0
Merge branch 'master' of /var/git/opensim/
2010-10-27 13:40:10 -07:00
1fcac7203d
Prevent nullrefs in scene object deletion. Mantis #5156
2010-10-27 20:47:27 +01:00
6f297a50cb
Merge branch 'master' of /var/git/opensim/
2010-10-26 21:30:05 -07:00
a4e95c0717
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-26 21:20:18 -07:00
5968d343bb
Overload Scene.NewUserConnection() to facilitate NPCs and other region specific applications
2010-10-26 21:19:33 -07:00
d6771ed4d5
Merge branch 'master' of /var/git/opensim/
2010-10-26 21:10:12 -07:00
a331fd4e24
Formatting cleanup.
2010-10-27 00:01:03 -04:00
49d7ff0307
Avatars no longer snap to middle of target sim when border crossing in a CM
2010-10-26 16:57:47 -07:00
9cfd3e1d5a
Small cleanup and add more debugging information
2010-10-26 12:54:28 -07:00
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
46a01d9550
Animations to multiple CMs (including idle anims) are working
2010-10-26 12:22:09 -07:00
5da2743c37
Merge branch 'master' into mantis5110
2010-10-25 22:27:35 -04:00
9f515cb623
Partial passing of StartAnim and StopAnim through CM
2010-10-25 15:52:41 -07:00
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
838ffc27ed
Create full updates for making sit complete
2010-10-25 13:32:53 -07:00
657cceb884
Intermediate commit for backward compatability; does not compile yet
2010-10-25 09:42:28 -07:00
a2c0ee8da7
Merge branch 'master' of /var/git/opensim/
2010-10-24 16:40:06 -07:00
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
07db35697b
Merge branch 'master' into mantis5110
2010-10-24 15:01:01 -04:00
ba9ef44506
Merge branch 'master' into mantis5110
2010-10-24 15:00:24 -04:00
6b9660eb96
Merge branch 'master' into mantis5110
2010-10-24 14:51:38 -04:00
17d3c76116
Merge branch 'master' of /var/git/opensim/
2010-10-24 11:10:07 -07:00
3fe8fc3d51
* throw debug message when no HomeURI is set
2010-10-24 13:32:34 -04:00
852c61aaa6
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:17:21 +01:00
c83453a69b
Merge branch 'master' of /var/git/opensim/
2010-10-23 20:40:07 -07:00
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
5ddb8b535e
* a bit of additional debugging:
2010-10-23 00:18:19 -04:00
bf5cc32b5f
Merge branch 'master' of /var/git/opensim/
2010-10-22 16:00:06 -07:00
80f90229e5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-22 23:56:58 +01:00
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e8f34e46d74
2010-10-22 23:52:07 +01:00
566b96a595
Merge branch 'master' of /var/git/opensim/
2010-10-22 15:50:09 -07:00
cc411bf5f3
Merge branch 'master' of /var/git/opensim/
2010-10-22 15:40:08 -07:00
21187f459e
Merge remote branch 'otakup0pe/mantis5110'
2010-10-22 23:35:07 +01:00
8f34e46d74
Revert "* refactor refactor refactor ServerURI 4 lyfe"
...
This reverts commit 55974df14b
2010-10-22 23:35:01 +01:00
783b1b548f
Revert "* additional serveruri cleanup"
...
This reverts commit 19119d7705
2010-10-22 23:34:53 +01:00
Melanie