ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-27 17:25:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,641 Commits 5 Branches 82 Tags
d5d0e81df2415203711fc418ac901b007f1e6607
Commit Graph

1663 Commits

Author SHA1 Message Date
Melanie
26f12f479f Merge branch 'master' into careminster-presence-refactor 2010-11-02 22:58:33 +00:00
Diva Canto
9f5ab3b965 Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical. 2010-11-02 12:05:24 -07:00
dahlia
ed7959ddfb Thanks Snoopy for a patch that addresses Mantis #0005165: osSetDynamicTextureURL crashed region server 
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
 2010-11-02 02:35:56 -07:00
Diva Canto
f15f0ab59b Removed a couple of very verbose debug messages. 2010-10-31 12:11:30 -07:00
Melanie
e98d8d500f Fix logins and avatar appearance. Contains a Migration. May contain nuts. 
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
 2010-10-30 19:06:47 +01:00
Teravus Ovares (Dan Olivares)
09bf9d5fca * AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer. 2010-10-30 02:26:48 -04:00
Justin Clark-Casey (justincc)
f9227977f8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-10-30 03:07:45 +01:00
Justin Clark-Casey (justincc)
45220a6954 minor: remove some old commented out code 2010-10-30 03:01:40 +01:00
Justin Clark-Casey (justincc)
ade71c9ed7 Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info 2010-10-30 01:32:56 +01:00
Melanie
7503c4ad61 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-30 00:56:42 +01:00
Melanie
818ed2032a READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. 
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
 2010-10-30 00:41:36 +01:00
Justin Clark-Casey (justincc)
e66ec432af Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic 2010-10-29 23:45:10 +01:00
Justin Clark-Casey (justincc)
abcde41c0d Merge branch 'justincc-dev' 2010-10-29 23:15:35 +01:00
Justin Clark-Casey (justincc)
bcd784b316 for now, comment out some older or redundant log debug lines to make diagnostics easier 2010-10-29 21:49:26 +01:00
Melanie
69c1e0b2f7 Merge branch 'master' into careminster-presence-refactor 2010-10-29 21:22:35 +01: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
9331898c32 Merge branch 'master' into careminster-presence-refactor 2010-10-29 20:40:48 +01:00
Melanie
05d2302c62 Merge branch 'dev-appearance' 2010-10-29 20:24:14 +01: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
e6a8d2872c Preliminary work on appearance layers. No user functionality yet. 2010-10-29 18:59:53 +02: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
Melanie
05dbe4f2c4 Merge branch 'master' into careminster-presence-refactor 2010-10-27 20:49:27 +01:00
Jeff Ames
a331fd4e24 Formatting cleanup. 2010-10-27 00:01:03 -04: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
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
Melanie
9a78281f82 Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-10-23 00:22:23 +01:00
Melanie
7f74dc1b14 Merge branch 'master' into careminster-presence-refactor 2010-10-23 00:21:42 +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
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)
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
Justin Clark-Casey (justincc)
772dbf59f3 slightly simplify oar control file loading code 2010-10-22 18:33:35 -04:00
Justin Clark-Casey (justincc)
460b9fffe5 write IAR control file first in the archive rather than last 2010-10-22 18:33:32 -04:00
Justin Clark-Casey (justincc)
e06acae965 Allow region modules to know which agents actually receive chat 2010-10-22 18:33:19 -04:00
Melanie
c3ddf46188 Prevent database lookups on every avatar movement when land is set to group 
access. Fixes a massive performance degradation.
 2010-10-23 00:18:56 +02:00
Justin Clark-Casey (justincc)
e6019dd6ac print IAR version number on console when saving 2010-10-22 19:34:06 +01:00
Justin Clark-Casey (justincc)
7f2d844916 Implement guard against trying to load incompatible version IARs 2010-10-22 19:30:15 +01:00
Justin Clark-Casey (justincc)
199b61f1b2 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 19:24:42 +01:00
Justin Clark-Casey (justincc)
a5bb7b8a30 slightly simplify oar control file loading code 2010-10-22 18:47:38 +01:00
Justin Clark-Casey (justincc)
bb28726a8b write IAR control file first in the archive rather than last 2010-10-22 18:39:40 +01:00
Jonathan Freedman
d4144bedb8 * change the data exchanged within hypergrid transactions 2010-10-21 23:22:15 -04:00