aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Formatting cleanup.Jeff Ames2010-10-275-50/+27
|
* Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-225-26/+50
| | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
* Merge remote branch 'otakup0pe/mantis5110'Justin Clark-Casey (justincc)2010-10-225-50/+26
|\
| * Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-225-50/+26
| |\
| | * * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-212-5/+8
| | |
| | * Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-202-19/+67
| | |\
| | * \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-201-0/+329
| | |\ \
| | * \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-181-3/+3
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1710-60/+609
| | |\ \ \ \
| | * | | | | * more url / hg cleanupJonathan Freedman2010-10-112-26/+12
| | | | | | |
| | * | | | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-102-3/+14
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-074-27/+80
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-052-3/+18
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-057-16/+35
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0311-68/+1448
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-032-4/+4
| | | | | | | | | | | |
| | * | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-022-21/+8
| | | | | | | | | | | |
| * | | | | | | | | | | 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-221-8/+36
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Revert "* refactor refactor refactor ServerURI 4 lyfe"Justin Clark-Casey (justincc)2010-10-222-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98.
* | | | | | | | | | | Revert "* additional serveruri cleanup"Justin Clark-Casey (justincc)2010-10-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19119d7705f8381a3c207d0e64a23243215a12b9.
* | | | | | | | | | | Revert "* more url / hg cleanup"Justin Clark-Casey (justincc)2010-10-222-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 58f75fa19d9aea18283ecdbd44559efb81781c9d.
* | | | | | | | | | | 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
| | | | | | | | | | |
* | | | | | | | | | | 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
* | | | | | | | | | | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-221-8/+36
| | | | | | | | | | |
* | | | | | | | | | | * more url / hg cleanupJonathan Freedman2010-10-202-26/+12
| | | | | | | | | | |
* | | | | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-202-4/+4
| | | | | | | | | | |
* | | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-202-21/+8
|/ / / / / / / / / /
* | | | | | | | | | Deleted verbose debug messages that are bringing sims to an halt. Increased ↵Diva Canto2010-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | * 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.
* | | | | | | .NET automagical serialization of SOPs replaced by manual serialization ↵Diva Canto2010-10-171-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | across the board.
* | | | | | | Drop max oar loading version back to 0 from 1Justin Clark-Casey (justincc)2010-10-161-1/+1
| | | | | | |
* | | | | | | Rip out version option since it turns out that the changed object ↵Justin Clark-Casey (justincc)2010-10-162-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | change --old-guids switch on the save oar command line to --version=<x>Justin Clark-Casey (justincc)2010-10-165-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | 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
* | | | | | | 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
* | | | | | | Fix test break - TestSerializeXml2() still requires old-guids optionJustin Clark-Casey (justincc)2010-10-161-3/+6
| | | | | | |
* | | | | | | Made OARs use the new serialization procedure. (TPs/crossings still on the ↵Diva Canto2010-10-155-17/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>.
generated by cgit v1.1 at 2024-12-21 08:00:23 +0000