Master ScienceSim
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
Master ScienceSim
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
Melanie
5f4badf9e2
Add my work on top of cmickeyb's
2010-10-29 20:44:29 +01:00
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
840b75ca9b
Add my work on top of cmickeyb's
2010-10-29 20:48:37 +02:00
Melanie
9331898c32
Merge branch 'master' into careminster-presence-refactor
2010-10-29 20:40:48 +01:00
Melanie
b800a299aa
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-29 20:36:03 +02:00
Melanie
dbd1a68b58
Fix a LSL issue and a prim naming issue
2010-10-29 20:35:06 +02:00
Melanie
3231602b88
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This reverts commit e6a8d2872c
.
2010-10-29 20:34:53 +02:00
Melanie
bd4e3b0aaf
Add a default alpha layer
2010-10-29 20:31:17 +02:00
Melanie
9c829c0410
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:58:22 +01:00
Melanie
e2b08bac6d
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-29 18:56:20 +01:00
Melanie
13129f1a8d
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:55:58 +01:00
Melanie
e6a8d2872c
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:59:53 +02: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
Melanie
a51a545cb9
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-10-28 13:24:45 +01: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
05dbe4f2c4
Merge branch 'master' into careminster-presence-refactor
2010-10-27 20:49:27 +01: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
Melanie
3113cc9129
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-25 01:24:42 +01:00
Melanie
ac370cf57b
Merge branch 'master' into careminster-presence-refactor
2010-10-25 01:24:30 +01:00
opensim mirror account
a2c0ee8da7
Merge branch 'master' of /var/git/opensim/
2010-10-24 16:40:06 -07:00
Melanie
cf78f3fae3
Comment repeated add and remove of avatars from the physical scene. It's no
...
longer needed.
2010-10-25 00:53:38 +02: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
Melanie
dd7f9ed7bf
Implement llGetLinkNumberOfSides(), needed for 1-script sculptie foot shoe
...
scripts.
2010-10-25 00:33:34 +02: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
Melanie
61137eac22
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:19:48 +02:00