aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-161-1/+1
|\ \ \ | |/ /
| * | Add missing check for !_projectionEntryBlueWall2010-10-161-1/+1
| |/ | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-151-1/+1
|\ \ | |/
| * Drop max oar loading version back to 0 from 1Justin Clark-Casey (justincc)2010-10-161-1/+1
| |
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-153-10/+13
|\ \ | |/
| * Rip out version option since it turns out that the changed object ↵Justin Clark-Casey (justincc)2010-10-163-10/+13
| | | | | | | | | | | | 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.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-156-11/+33
|\ \ | |/
| * change --old-guids switch on the save oar command line to --version=<x>Justin Clark-Casey (justincc)2010-10-166-11/+33
| | | | | | | | | | | | 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
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-152-1/+23
|\ \ | |/
| * Have OpenSim throw a strop if it tries to load an OAR with a major version ↵Justin Clark-Casey (justincc)2010-10-162-1/+23
| | | | | | | | that is too high for it to handle
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-153-38/+41
|\ \ | |/
| * save oar control file first rather than in the middle so that it's the first ↵Justin Clark-Casey (justincc)2010-10-163-38/+41
| | | | | | | | | | | | 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
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-151-3/+6
|\ \ | |/
| * Fix test break - TestSerializeXml2() still requires old-guids optionJustin Clark-Casey (justincc)2010-10-161-3/+6
| |
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-1511-143/+189
|\ \ | |/
| * Made OARs use the new serialization procedure. (TPs/crossings still on the ↵Diva Canto2010-10-1511-143/+189
| | | | | | | | 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>.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-152-0/+1
|\ \ | |/
| * UPdated the MySql driver to 6.2.4. Also established a much larger ↵Diva Canto2010-10-152-0/+1
| | | | | | | | MySqlCommand timeout on fetching prims.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-151-0/+80
|\ \ | |/
| * Adding projected light filters to prim propetiesBlueWall2010-10-151-0/+80
| | | | | | | | | | Requires the LL Mesh Beta viewer Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-0/+8
|\ \ | |/
| * A couple of more ways attachment point is sentLatif Khalifa2010-10-151-0/+8
| | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-140-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-150-0/+0
| |\
| * | one more silly line ending thing.... *If you have problems, fetch the tree ↵Teravus Ovares (Dan Olivares)2010-10-151-71/+71
| | | | | | | | | | | | | | | | | | and rebase. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-71/+71
|\ \ \ | | |/ | |/|
| * | one more silly line ending thing....Teravus Ovares (Dan Olivares)2010-10-141-71/+71
| |/ | | | | | | *If you have problems, fetch the tree and rebase.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-143-24/+75
|\ \ | |/
| * more work in progress on mesh physics - still non-functionaldahlia2010-10-143-24/+75
| |
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-146-6/+63
|\ \ | |/
| * libomv update to support headerless llsd binary deserialization needed for ↵Latif Khalifa2010-10-146-6/+63
| | | | | | | | | | | | mesh asset decoding Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-70/+80
|\ \ | |/
| * laying some groundwork for mesh physicsdahlia2010-10-141-70/+80
| |
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-4/+4
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-144-108/+171
| |\
| * | * Replacing Magic numbers with EnumsTeravus Ovares (Dan Olivares)2010-10-142-4/+4
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-3/+7
|\ \ \ | | |/ | |/|
| * | Don't distroy attachments when using viewer 2.1+, strip multiple attachment dataLatif Khalifa2010-10-141-0/+4
| | |
| * | Kill some magic numbers in the mesh upload module and change the mesh assetMelanie2010-10-141-3/+3
| | | | | | | | | | | | type from 45 to 49 to match OMV trunk
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-105/+164
|\ \ \ | |/ /
| * | Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ↵Diva Canto2010-10-142-105/+164
| |/ | | | | | | to be generating xml's that are successfully parsed. Needs more testing.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-147-15645/+15726
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| |\ | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| * | Updated to libomv-opensim r3449Latif Khalifa2010-10-147-15645/+15726
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-0/+6
|\ \ \ | | |/ | |/|
| * | * A few additional cleanup elementsTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| |/ | | | | | | | | * 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.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-1/+1
|\ \ | |/
| * * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'Teravus Ovares (Dan Olivares)2010-10-141-1/+1
| | | | | | | | * 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.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-143-16/+35
|\ \ | |/
| * * Tweaked the upload response and now at least uploading the mesh works.Teravus Ovares (Dan Olivares)2010-10-143-16/+35
| | | | | | | | * Binary error on downloading the mesh though.. so still not yet working.