9e421868e3
Add missing check for !_projectionEntry
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-16 20:59:18 -04:00
46e5c8e919
Merge branch 'master' into careminster-presence-refactor
2010-10-16 10:52:56 +01:00
e6d0fb0b0e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-16 10:51:44 +02:00
efc555ca22
Actually set the PrivateBinPath in XEngine so relocating the scripts
...
directory works
2010-10-16 10:50:07 +02:00
4c0bbc8661
Merge branch 'master' of /var/git/opensim/
2010-10-15 23:30:04 -07:00
06d37d06e6
Drop max oar loading version back to 0 from 1
2010-10-16 07:25:55 +01:00
6998f9268b
Merge branch 'master' of /var/git/opensim/
2010-10-15 23:20:03 -07:00
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
907c576c00
Merge branch 'master' of /var/git/opensim/
2010-10-15 21:40:03 -07:00
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
4f6badca04
Merge branch 'master' of /var/git/opensim/
2010-10-15 21:10:02 -07:00
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
e2c04e15b9
Merge branch 'master' of /var/git/opensim/
2010-10-15 20:00:08 -07:00
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
2a2bb5ebf1
Merge branch 'master' of /var/git/opensim/
2010-10-15 18:40:03 -07:00
fe4e6ff811
Fix test break - TestSerializeXml2() still requires old-guids option
2010-10-16 02:38:46 +01:00
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01:00
06b17841e2
Merge branch 'master' of /var/git/opensim/
2010-10-15 17:30:05 -07:00
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
1341ad1c91
Merge branch 'master' of /var/git/opensim/
2010-10-15 15:50:04 -07:00
e039a8c8c2
UPdated the MySql driver to 6.2.4. Also established a much larger MySqlCommand timeout on fetching prims.
2010-10-15 15:43:06 -07:00
d99d7e2f63
Merge branch 'master' of /var/git/opensim/
2010-10-15 06:50:07 -07:00
dd1058e6b3
Adding projected light filters to prim propeties
...
Requires the LL Mesh Beta viewer
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 09:46:49 -04:00
bec522cc09
Merge branch 'master' of /var/git/opensim/
2010-10-14 23:00:04 -07:00
cd4d7a7c35
A couple of more ways attachment point is sent
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:56:08 -04:00
44b163bba7
Merge branch 'master' of /var/git/opensim/
2010-10-14 22:50:03 -07:00
de696a2fc6
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-15 01:46:00 -04:00
0308982c58
one more silly line ending thing.... *If you have problems, fetch the tree and rebase.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:45:25 -04:00
28a45a7914
Merge branch 'master' of /var/git/opensim/
2010-10-14 20:40:09 -07:00
657ff01212
one more silly line ending thing....
...
*If you have problems, fetch the tree and rebase.
2010-10-14 23:32:33 -04:00
19fdfc1a97
Merge branch 'master' of /var/git/opensim/
2010-10-14 20:30:04 -07:00
bcdd03c1cf
more work in progress on mesh physics - still non-functional
2010-10-14 20:25:31 -07:00
49b4281ac6
Merge branch 'master' of /var/git/opensim/
2010-10-14 18:30:05 -07:00
b4c54765d2
libomv update to support headerless llsd binary deserialization needed for mesh asset decoding
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-14 21:26:26 -04:00
ad5e6da4df
Merge branch 'master' of /var/git/opensim/
2010-10-14 13:20:04 -07:00
2d88394cd5
laying some groundwork for mesh physics
2010-10-14 13:10:03 -07:00
cb2c1d794c
Merge branch 'master' of /var/git/opensim/
2010-10-14 09:30:05 -07:00
486eede9be
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 12:24:07 -04:00
c148ef25a9
* Replacing Magic numbers with Enums
2010-10-14 12:23:41 -04:00
8f16d65896
Merge branch 'master' of /var/git/opensim/
2010-10-14 09:20:04 -07:00
5dc8638d8b
Merge branch 'master' of /var/git/opensim/
2010-10-14 09:10:02 -07:00
41ce392d9b
Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems to be generating xml's that are successfully parsed. Needs more testing.
2010-10-14 09:05:46 -07:00
405935492b
Don't distroy attachments when using viewer 2.1+, strip multiple attachment data
2010-10-14 16:28:51 +01:00
ba247f729d
Kill some magic numbers in the mesh upload module and change the mesh asset
...
type from 45 to 49 to match OMV trunk
2010-10-14 16:28:51 +01:00
64a41f67c5
Merge branch 'master' of /var/git/opensim/
2010-10-14 07:20:09 -07:00
3cb716d291
Merge branch 'master' of ssh://MyConnection/var/git/opensim
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-14 10:12:57 -04:00
a3eeca174e
Merge branch 'master' of /var/git/opensim/
2010-10-14 07:00:06 -07:00
05c4e27a30
* A few additional cleanup elements
...
* At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong.
* Special thanks to John Hurliman and Latif Khalifa for their valuable insight.
2010-10-14 09:57:42 -04:00
69dbfe2a69
Updated to libomv-opensim r3449
2010-10-14 15:46:36 +02:00
88959e045b
Merge branch 'master' of /var/git/opensim/
2010-10-14 06:40:25 -07:00
BlueWall