aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-2225-193/+214
|\
| * * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-2110-44/+108
| |
| * Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-203-20/+68
| |\
| * | * remove some spurious debug infoJonathan Freedman2010-10-203-20/+22
| | |
| * | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-202-8/+379
| |\ \
| * \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-189-66/+115
| |\ \ \
| * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1727-331/+2400
| |\ \ \ \
| * | | | | * more url / hg cleanupJonathan Freedman2010-10-118-45/+56
| | | | | |
| * | | | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-107-32/+49
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0714-70/+369
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0517-30051/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-053-3/+20
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0528-70/+213
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0314-71/+1462
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-038-54/+20
| | | | | | | | | | | |
| * | | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-0214-94/+72
| | | | | | | | | | | |
* | | | | | | | | | | | Fix llParcelMediaCommandList() so that it applies commands only to the ↵Justin Clark-Casey (justincc)2010-10-221-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-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-222-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 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
| | | | | | | | | | | |
* | | | | | | | | | | | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-222-8/+71
| | | | | | | | | | | |
* | | | | | | | | | | | This fixes a delay in llSetLinkPrimitiveParamsFastAdelleF2010-10-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
* | | | | | | | | | | | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-222-9/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Remove a bit of dead code relating to ObjectCapacityMelanie2010-10-221-2/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Fix the OOB error (#5102). Sorry, my bad.Melanie2010-10-221-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Skip empty strings in ParseString* functionsMelanie2010-10-221-0/+6
| | | | | | | | | | | |
* | | | | | | | | | | | fix combining of multiple physics submeshesdahlia2010-10-201-3/+4
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | 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.
* | | | | | | | | | | * 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.
* | | | | | | | | | 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.
* | | | | | | | | | Another take related to the previous commit.Diva Canto2010-10-191-13/+17
| | | | | | | | | |
* | | | | | | | | | 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.
* | | | | | | | | | Added TextureAnimation and ParticleSystem to serialization.Diva Canto2010-10-191-0/+27
| | | | | | | | | |
* | | | | | | | | | * 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
* | | | | | | | | | * 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.
* | | | | | | | | Stop the InventoryTransferModule logging every IM notification it receives, ↵Justin Clark-Casey (justincc)2010-10-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even if they are nothing to do with it.
* | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-191-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | COmmented the wrong line instead, now I commented them all to be on the safe ↵Melanie2010-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | side
* | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-1911-173/+284
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Comment a spammy debug message in the serializerMelanie2010-10-191-1/+1
| | | | | | | | | |
| * | | | | | | | | Change substring matching to prefix matching in region search. This affectsMelanie2010-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | both map and login, as they use the same method.
| * | | | | | | | | Alphabetize results on region search by prefix matchingMelanie2010-10-181-0/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-184-164/+173
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | remove some cruft from last commitdahlia2010-10-181-8/+0
| | | | | | | | | | |
| | * | | | | | | | | initial support for meshies physics. Must set ini option ↵dahlia2010-10-181-43/+94
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example.
| | * | | | | | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-10-174-6/+106
| | |\ \ \ \ \ \ \ \