OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,655 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

13655 Commits (57b5263ecf9b78534d71e147a7dc152d19cbc4a4)

Author SHA1 Message Date
Justin Clark-Casey (justincc) fe4e6ff811 Fix test break - TestSerializeXml2() still requires old-guids option 2010-10-16 02:38:46 +01:00
opensim mirror account 06b17841e2 Merge branch 'master' of /var/git/opensim/ 2010-10-15 17:30:05 -07: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
opensim mirror account 1341ad1c91 Merge branch 'master' of /var/git/opensim/ 2010-10-15 15:50:04 -07:00
Diva Canto 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
opensim mirror account d99d7e2f63 Merge branch 'master' of /var/git/opensim/ 2010-10-15 06:50:07 -07:00
BlueWall 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
opensim mirror account bec522cc09 Merge branch 'master' of /var/git/opensim/ 2010-10-14 23:00:04 -07:00
Latif Khalifa 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
opensim mirror account 44b163bba7 Merge branch 'master' of /var/git/opensim/ 2010-10-14 22:50:03 -07:00
Teravus Ovares (Dan Olivares) de696a2fc6 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-10-15 01:46:00 -04:00
Teravus Ovares (Dan Olivares) 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
opensim mirror account 28a45a7914 Merge branch 'master' of /var/git/opensim/ 2010-10-14 20:40:09 -07:00
Teravus Ovares (Dan Olivares) 657ff01212 one more silly line ending thing.... 
*If you have problems, fetch the tree and rebase.
 2010-10-14 23:32:33 -04:00
opensim mirror account 19fdfc1a97 Merge branch 'master' of /var/git/opensim/ 2010-10-14 20:30:04 -07:00
dahlia bcdd03c1cf more work in progress on mesh physics - still non-functional 2010-10-14 20:25:31 -07:00
opensim mirror account 49b4281ac6 Merge branch 'master' of /var/git/opensim/ 2010-10-14 18:30:05 -07:00
Latif Khalifa 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
opensim mirror account ad5e6da4df Merge branch 'master' of /var/git/opensim/ 2010-10-14 13:20:04 -07:00
dahlia 2d88394cd5 laying some groundwork for mesh physics 2010-10-14 13:10:03 -07:00
opensim mirror account cb2c1d794c Merge branch 'master' of /var/git/opensim/ 2010-10-14 09:30:05 -07:00
Teravus Ovares (Dan Olivares) 486eede9be Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-10-14 12:24:07 -04:00
Teravus Ovares (Dan Olivares) c148ef25a9 * Replacing Magic numbers with Enums 2010-10-14 12:23:41 -04:00
opensim mirror account 8f16d65896 Merge branch 'master' of /var/git/opensim/ 2010-10-14 09:20:04 -07:00
opensim mirror account 5dc8638d8b Merge branch 'master' of /var/git/opensim/ 2010-10-14 09:10:02 -07:00
Diva Canto 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
Latif Khalifa 405935492b Don't distroy attachments when using viewer 2.1+, strip multiple attachment data 2010-10-14 16:28:51 +01:00
Melanie 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
opensim mirror account 64a41f67c5 Merge branch 'master' of /var/git/opensim/ 2010-10-14 07:20:09 -07:00
Teravus Ovares (Dan Olivares) 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
opensim mirror account a3eeca174e Merge branch 'master' of /var/git/opensim/ 2010-10-14 07:00:06 -07:00
Teravus Ovares (Dan Olivares) 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
Latif Khalifa 69dbfe2a69 Updated to libomv-opensim r3449 2010-10-14 15:46:36 +02:00
opensim mirror account 88959e045b Merge branch 'master' of /var/git/opensim/ 2010-10-14 06:40:25 -07:00
Teravus Ovares (Dan Olivares) 6d99f0c627 * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST' 
* At this point.   Visually, Mesh works OK.   Remember peeps, this is still highly experimental from the viewer side as well as the Simulator side.   There are known problems with the new beta viewers and attachment breaking so be careful until that's fixed.    Additionally there some new properties in the Mesh Viewer that determine physics settings that are non-functional.   More work will be done on that.
 2010-10-14 09:34:37 -04:00
opensim mirror account 5af10a61e4 Merge branch 'master' of /var/git/opensim/ 2010-10-14 06:30:13 -07:00
Teravus Ovares (Dan Olivares) 7e363b79c7 * Tweaked the upload response and now at least uploading the mesh works. 
* Binary error on downloading the mesh though..   so still not yet working.
 2010-10-14 09:24:15 -04:00
opensim mirror account b75dfdd151 Merge branch 'master' of /var/git/opensim/ 2010-10-14 00:30:06 -07:00
Teravus Ovares (Dan Olivares) 9c5f8a6802 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-10-14 03:23:37 -04:00
Teravus Ovares (Dan Olivares) b4a5ce148c Rename file + more testing and tweaking 2010-10-14 03:22:44 -04:00
opensim mirror account 84fc9e003f Merge branch 'master' of /var/git/opensim/ 2010-10-14 00:20:04 -07:00
opensim mirror account eb606559e7 Merge branch 'master' of /var/git/opensim/ 2010-10-13 23:30:06 -07:00
Melanie 6ac6ca057d Kill some magic numbers in the caps module 2010-10-14 07:28:20 +01:00
Teravus Ovares (Dan Olivares) 3384f643eb * Partially complete stuff for Mesh support that Melanie wanted to see before it was done. 
* Shouldn't break the build.
* Doesn't work yet either.
 2010-10-14 02:19:42 -04:00
opensim mirror account 2f582500ce Merge branch 'master' of /var/git/opensim/ 2010-10-13 17:40:06 -07:00
Teravus Ovares (Dan Olivares) 46738bbd16 Merge branch 'master' of ssh://MyConnection/var/git/opensim 
Conflicts:
	bin/OpenSimDefaults.ini
 2010-10-13 20:29:55 -04:00
Teravus Ovares (Dan Olivares) 1a57c65810 * Normalizing endlines so git stops complaining about them being inconsistent. 
* People will hate me for updating OpenSimDefaults..   but meh.   Gotta be done or git is unhappy.
 2010-10-13 20:26:46 -04:00
opensim mirror account b44c894ba1 Merge branch 'master' of /var/git/opensim/ 2010-10-13 15:50:03 -07:00
Diva Canto 45e0cdfcad Added SOP.MediaUrl and Shape.Media to the deserialization 2010-10-13 15:44:25 -07:00
opensim mirror account 6e37e55063 Merge branch 'master' of /var/git/opensim/ 2010-10-13 14:20:03 -07:00