aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-226-20/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Allow OARs and IARs to save and load meshes.Justin Clark-Casey (justincc)2010-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/ However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer). Not sure if this is really and OAR load problem. Needs more investigation.
| * | | | | | | | | | | | | print IAR version number on console when savingJustin Clark-Casey (justincc)2010-10-221-2/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Implement guard against trying to load incompatible version IARsJustin Clark-Casey (justincc)2010-10-222-3/+20
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | start parsing iar control fileJustin Clark-Casey (justincc)2010-10-223-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
| * | | | | | | | | | | | | slightly simplify oar control file loading codeJustin Clark-Casey (justincc)2010-10-221-10/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | write IAR control file first in the archive rather than lastJustin Clark-Casey (justincc)2010-10-222-5/+8
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | minor: add some text to the oar abort messages on assets timeout to make it ↵Justin Clark-Casey (justincc)2010-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear that the oar will not be usable
* | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-212-8/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-222-8/+71
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | This fixes a delay in llSetLinkPrimitiveParamsFastAdelleF2010-10-211-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
* | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Deleted a verbose and unneeded log message.Diva Canto2010-10-211-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-212-9/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-212-9/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Remove a bit of dead code relating to ObjectCapacityMelanie2010-10-211-2/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Fix the OOB error (#5102). Sorry, my bad.Melanie2010-10-211-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Skip empty strings in ParseString* functionsMelanie2010-10-211-0/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-201-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-2021-166/+123
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | fix combining of multiple physics submeshesdahlia2010-10-201-3/+4
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-2021-166/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | * remove some spurious debug infoJonathan Freedman2010-10-203-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| * | | | | | | | | | | | * more url / hg cleanupJonathan Freedman2010-10-208-45/+56
| | | | | | | | | | | | |
| * | | | | | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-208-54/+20
| | | | | | | | | | | | |
| * | | | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-2014-94/+72
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-193-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Deleted verbose debug messages that are bringing sims to an halt. Increased ↵Diva Canto2010-10-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the user cache expiration period to 33 hours.
| * | | | | | | | | | | * One more goofy thing. I note that the sculpt texture id is broken out of ↵Teravus Ovares (Dan Olivares)2010-10-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the ExtraParams data in UploadObjectAsset. At this moment, if you're uploading a Sculpt, make sure to break out the Texture ID into the object data or it might not get applied appropriately.
* | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-17/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | * This removes an ugly extraparams hack that I used and makes ↵Teravus Ovares (Dan Olivares)2010-10-201-17/+62
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadObjectAsset into a generic linkset upload tool.
* | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | It looks like Vector3s also got written down in lower case at some point in ↵Diva Canto2010-10-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time. Added code to account for that. 17:45:59 - [SceneObjectSerializer]: exception while parsing SitTargetPosition: System.Xml.XmlException: Expecting X tag from namespace , got x and instead Line 1, position 2838.
* | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-13/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Another take related to the previous commit.Diva Canto2010-10-191-13/+17
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-4/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Added code to quaternion deserialization to try to cope with an exception ↵Diva Canto2010-10-191-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seen in Wright Plaza related to SitTargetOrientation. 17:23:05 - [SceneObjectSerializer]: exception while parsing SitTargetOrientation: System.Xml.XmlException: Expecting X tag from namespace , got w and instead Line 1, position 30064.
* | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-0/+27
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Added TextureAnimation and ParticleSystem to serialization.Diva Canto2010-10-191-0/+27
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-48/+76
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | * This concludes UploadObjectAsset for now until the permissions and physics ↵Teravus Ovares (Dan Olivares)2010-10-191-48/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shape are added to the message serialization. * You should now be able to upload multiple mesh collada mesh objects. They should appear in front of you (or on top of you!) when you upload them. * Once again, thanks to John Hurliman and Latif Khalifa for insight and smxy for cheering me on :D
* | | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-0/+301
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | * Almost complete implementation of UploadObjectAsset cap. all meshes get ↵Teravus Ovares (Dan Olivares)2010-10-181-0/+301
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | uploaded but they're improperly positioned/oriented at the moment.
* | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-182-3/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Add 'contributors' notice for zlib.net.dll to keep track of its origin and ↵Justin Clark-Casey (justincc)2010-10-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version. Dahlia, please correct the details if they're wrong.