aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-201-0/+329
|\
| * * 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.
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-181-3/+3
|\ \ | |/
| * 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 git://opensimulator.org/git/opensimJonathan Freedman2010-10-1710-60/+609
|\ \ | |/
| * .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>.
| * 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 ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-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
| * | * Replacing Magic numbers with EnumsTeravus Ovares (Dan Olivares)2010-10-142-4/+4
| |/
| * * 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.
| * * 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.
| * * Tweaked the upload response and now at least uploading the mesh works.Teravus Ovares (Dan Olivares)2010-10-142-16/+21
| | | | | | | | * Binary error on downloading the mesh though.. so still not yet working.
| * Rename file + more testing and tweakingTeravus Ovares (Dan Olivares)2010-10-141-9/+17
| |
| * * Partially complete stuff for Mesh support that Melanie wanted to see ↵Teravus Ovares (Dan Olivares)2010-10-142-0/+449
| | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either.
* | * more url / hg cleanupJonathan Freedman2010-10-112-26/+12
| |
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-102-3/+14
|\ \ | |/
| * Fix a typo in previouis commit: start must not pass the end of the fileLatif Khalifa2010-10-091-2/+2
| |
| * weird line endings fix commitTeravus Ovares (Dan Olivares)2010-10-091-7/+7
| |
| * Return error code instead of the last byte of the file if range is not ↵Latif Khalifa2010-10-091-1/+9
| | | | | | | | satisfiable
| * In case when 1 single byte is requested (yes viewer does this)Latif Khalifa2010-10-091-2/+2
| | | | | | | | | | | | | | | | | | | | start of the ranges gets clamped with a wrong value. In case of a texture with 601 byte long texture the viewer request range 0-599 first, then 600- in which case both start and end should be 600. End can also be 0, valid request for the firt byte of the file is 0-0. Thanks to Thickbrick for explaining how HTTP range header works.
| * Fix an infinite recursionMelanie2010-10-081-1/+4
| |
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-074-27/+80
|\ \ | |/
| * Plumb the path for multiple object deletesMelanie2010-10-061-5/+26
| |
| * Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-062-10/+12
| | | | | | | | functional
| * Fix incorrect class nameMelanie2010-10-061-1/+1
| |
| * Convert the map image modules to new style modulesMelanie2010-10-063-12/+42
| |
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-052-3/+18
|\ \ | |/
| * Add the view generating method to the image generator interfaceMelanie2010-10-051-0/+5
| |
| * Revert an accidental default value changeMelanie2010-10-051-1/+1
| |
| * Patch to allow other cam angles. Not complete. Thanks, Antont.Melanie2010-10-051-4/+14
| |
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-057-16/+35
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-052-7/+7
| |\
| | * Formatting cleanup.Jeff Ames2010-10-042-7/+7
| | |
| * | Make windlight set the default environment on startBlueWall2010-10-051-0/+1
| |/
| * Avoid throwing errors when adding existing meshes to the render sceneLatif Khalifa2010-10-041-0/+6
| |
| * Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵Diva Canto2010-10-031-5/+17
| | | | | | | | client ip address to agent circuit data, so that it's always there.
| * Add linden prim renderer and update libOMVMelanie2010-10-042-4/+4
| |
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0311-68/+1448
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-031-21/+34
| |\
| | * Attempt at fixing mantis #5057 -- CPU pinned high with HGAssetBroker.Diva Canto2010-10-021-21/+34
| | |
generated by cgit v1.1 at 2024-12-19 15:51:37 +0000