Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 25 | -193/+214 |
|\ | |||||
| * | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 10 | -44/+108 |
| | | |||||
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 3 | -20/+68 |
| |\ | |||||
| * | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 3 | -20/+22 |
| | | | |||||
| * | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 2 | -8/+379 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-18 | 9 | -66/+115 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 27 | -331/+2400 |
| |\ \ \ \ | |||||
| * | | | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 8 | -45/+56 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 7 | -32/+49 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-07 | 14 | -70/+369 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 17 | -30051/+0 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 3 | -3/+20 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 28 | -70/+213 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 14 | -71/+1462 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 8 | -54/+20 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 14 | -94/+72 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fix llParcelMediaCommandList() so that it applies commands only to the ↵ | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel that the script is in, not all parcels. Patch from http://opensimulator.org/mantis/view.php?id=2738 Thanks snoopy and fineman. | ||||
* | | | | | | | | | | | | Allow OARs and IARs to save and load meshes. | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -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 saving | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+6 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Implement guard against trying to load incompatible version IARs | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -3/+20 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | start parsing iar control file | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml | ||||
* | | | | | | | | | | | | slightly simplify oar control file loading code | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -10/+3 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | write IAR control file first in the archive rather than last | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -5/+8 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -8/+71 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | This fixes a delay in llSetLinkPrimitiveParamsFast | AdelleF | 2010-10-22 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | ||||
* | | | | | | | | | | | | Make SImStatsReporter pick ObjectCapacity striaght out of region info | Melanie | 2010-10-22 | 2 | -9/+3 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Remove a bit of dead code relating to ObjectCapacity | Melanie | 2010-10-22 | 1 | -2/+0 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fix the OOB error (#5102). Sorry, my bad. | Melanie | 2010-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Skip empty strings in ParseString* functions | Melanie | 2010-10-22 | 1 | -0/+6 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | fix combining of multiple physics submeshes | dahlia | 2010-10-20 | 1 | -3/+4 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Deleted verbose debug messages that are bringing sims to an halt. Increased ↵ | Diva Canto | 2010-10-19 | 2 | -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-20 | 1 | -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. | ||||
* | | | | | | | | | | | * This removes an ugly extraparams hack that I used and makes ↵ | Teravus Ovares (Dan Olivares) | 2010-10-20 | 1 | -17/+62 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadObjectAsset into a generic linkset upload tool. | ||||
* | | | | | | | | | | It looks like Vector3s also got written down in lower case at some point in ↵ | Diva Canto | 2010-10-19 | 1 | -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. | ||||
* | | | | | | | | | | Another take related to the previous commit. | Diva Canto | 2010-10-19 | 1 | -13/+17 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Added code to quaternion deserialization to try to cope with an exception ↵ | Diva Canto | 2010-10-19 | 1 | -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. | ||||
* | | | | | | | | | | Added TextureAnimation and ParticleSystem to serialization. | Diva Canto | 2010-10-19 | 1 | -0/+27 |
| | | | | | | | | | | |||||
* | | | | | | | | | | * This concludes UploadObjectAsset for now until the permissions and physics ↵ | Teravus Ovares (Dan Olivares) | 2010-10-19 | 1 | -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 | ||||
* | | | | | | | | | | * Almost complete implementation of UploadObjectAsset cap. all meshes get ↵ | Teravus Ovares (Dan Olivares) | 2010-10-18 | 1 | -0/+301 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | uploaded but they're improperly positioned/oriented at the moment. | ||||
* | | | | | | | | | Stop the InventoryTransferModule logging every IM notification it receives, ↵ | Justin Clark-Casey (justincc) | 2010-10-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even if they are nothing to do with it. | ||||
* | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | COmmented the wrong line instead, now I commented them all to be on the safe ↵ | Melanie | 2010-10-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | side | ||||
* | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-19 | 11 | -173/+284 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Comment a spammy debug message in the serializer | Melanie | 2010-10-19 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Change substring matching to prefix matching in region search. This affects | Melanie | 2010-10-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | both map and login, as they use the same method. | ||||
| * | | | | | | | | | Alphabetize results on region search by prefix matching | Melanie | 2010-10-18 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-18 | 4 | -164/+173 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | remove some cruft from last commit | dahlia | 2010-10-18 | 1 | -8/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | initial support for meshies physics. Must set ini option ↵ | dahlia | 2010-10-18 | 1 | -43/+94 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example. | ||||
| | * | | | | | | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-10-17 | 4 | -6/+106 |
| | |\ \ \ \ \ \ \ \ |