ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,529 Commits 5 Branches 88 Tags
d555c373d88586a868d5a466b5933fcfd9c8a3e8
Commit Graph

460 Commits

Author SHA1 Message Date
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
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)
bcd784b316 for now, comment out some older or redundant log debug lines to make diagnostics easier 2010-10-29 21:49:26 +01:00
Jeff Ames
a331fd4e24 Formatting cleanup. 2010-10-27 00:01:03 -04: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)
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)
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
Justin Clark-Casey (justincc)
e7f184345e minor: add some text to the oar abort messages on assets timeout to make it clear that the oar will not be usable 2010-10-22 01:52:19 +01:00
Jonathan Freedman
19119d7705 * additional serveruri cleanup 2010-10-20 22:21:41 -04:00
Jonathan Freedman
55974df14b * refactor refactor refactor ServerURI 4 lyfe 2010-10-20 22:21:23 -04:00
Jonathan Freedman
4e4fb93fae Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-17 18:45:25 -04:00
Diva Canto
22eff055d4 .NET automagical serialization of SOPs replaced by manual serialization across the board. 2010-10-17 10:35:38 -07:00
Justin Clark-Casey (justincc)
06d37d06e6 Drop max oar loading version back to 0 from 1 2010-10-16 07:25:55 +01:00
Justin Clark-Casey (justincc)
edc31adf95 Rip out version option since it turns out that the changed object serialization format can actually be loaded by older OpenSims after all 
This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now.
 2010-10-16 07:09:13 +01:00
Justin Clark-Casey (justincc)
e41b23a1a4 change --old-guids switch on the save oar command line to --version=<x> 
if x is 0, then an old version 0.3 archive is saved.  If it is anything else or missing, then a version 1.0 archive is saved
version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier
also add various informational notices about what version we've saving/loading
 2010-10-16 05:38:44 +01:00
Justin Clark-Casey (justincc)
3df8d8ff76 Have OpenSim throw a strop if it tries to load an OAR with a major version that is too high for it to handle 2010-10-16 04:59:51 +01:00
Justin Clark-Casey (justincc)
1bd4219078 save oar control file first rather than in the middle so that it's the first thing we come accross on load 
this exposes a weekness with using tar where we don't control the order in which files are loaded.  can't be helped for now
 2010-10-16 03:52:11 +01:00
Justin Clark-Casey (justincc)
fe4e6ff811 Fix test break - TestSerializeXml2() still requires old-guids option 2010-10-16 02:38:46 +01:00
Diva Canto
1499607215 Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>. 2010-10-15 17:27:19 -07:00
Jonathan Freedman
4adada6fe4 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-07 23:47:39 -04:00
Melanie
d45276b3f6 Add and plumb the usetex URL parameter to worldview. Required but not yet 
functional
 2010-10-06 05:44:19 +01:00
Melanie
c97398575c Convert the map image modules to new style modules 2010-10-06 01:42:18 +01:00
Jonathan Freedman
593fc5c87a Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-05 19:45:37 -04:00
Melanie
5d61323192 Add the view generating method to the image generator interface 2010-10-05 23:49:21 +01:00
Melanie
b424af6187 Revert an accidental default value change 2010-10-05 23:06:29 +01:00
Melanie
eb491d2c36 Patch to allow other cam angles. Not complete. Thanks, Antont. 2010-10-05 22:56:20 +01:00
Jonathan Freedman
8f1acb890a Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-05 14:17:18 -04:00
Latif Khalifa
cb6e4035c7 Avoid throwing errors when adding existing meshes to the render scene 2010-10-04 06:02:09 +01:00
Jonathan Freedman
e3099d48f9 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-03 18:04:38 -04:00
Jonathan Freedman
69acf9c79b * additional serveruri cleanup 2010-10-03 18:03:53 -04:00
Melanie
4f70ac018b Adapt to core changes 2010-10-03 16:40:11 +01:00
Melanie
27340f616e Addign the new / renamed files for previous commit 2010-10-03 16:34:55 +01:00
Melanie
ab4be3ffdf Initial port of the Warp3D map tile renderer 2010-10-03 16:34:17 +01:00
Jonathan Freedman
32ccc7a9d9 * refactor refactor refactor ServerURI 4 lyfe 2010-10-02 19:17:02 -04:00
Melanie
87c6386884 Reapplying the parts of the prior revert that were not derived from the 
original patch
 2010-10-02 18:47:26 +01:00
Melanie
b01020b84a Revert "Forward-port 0.6 fix" 
This reverts commit 90b51dc7d6.
 2010-10-02 18:45:48 +01:00
Melanie
90b51dc7d6 Forward-port 0.6 fix 2010-09-30 15:52:33 +01:00
Melanie
0339d420e7 Restrict top colliders / top scripts to estate managers 2010-09-27 03:45:22 +01:00
Melanie
dc49057c8a Consistency patch: use Path.Combine() instead of + and eliminate the need 
for a trailing slash on exports/
 2010-09-26 20:03:00 +01:00
Melanie
3b76d7bbb6 Fix a minor economy issue 2010-09-25 06:09:35 +01:00