aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix merge issuesMelanie2010-10-181-12/+0
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-187-159/+235
|\
| * 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-173-0/+55
| |\
| | * Adding osFunctions for light projectionBlueWall2010-10-173-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the projection parameters in the host prim ... osSetProjectionParam(bool Enabled, key TextureMaskUUID, float FOV, float Focus, float Ambiance); Set the projection parameters in a target prim ... osSetProjectionParam(ikey target uuid, bool Enabled, key TextureMaskUUID, float FOV, float Focus, float Ambiance); Threat Level very high Signed-off-by: Melanie <melanie@t-data.com>
| * | Deleted all [XmlIgnore] from SOP, since those are meaningless now.Diva Canto2010-10-172-58/+58
| | |
| * | .NET automagical serialization of SOPs replaced by manual serialization ↵Diva Canto2010-10-173-62/+28
| |/ | | | | | | across the board.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-1611-180/+279
|\ \ | |/
| * 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-163-10/+13
| | | | | | | | | | | | 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-166-11/+33
| | | | | | | | | | | | 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-1510-142/+188
| | | | | | | | 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>.
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-166-375/+799
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-166-375/+799
| |\ \ | | |/
| | * A couple of more ways attachment point is sentLatif Khalifa2010-10-151-0/+8
| | | | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| | * one more silly line ending thing.... *If you have problems, fetch the tree ↵Teravus Ovares (Dan Olivares)2010-10-151-71/+71
| | | | | | | | | | | | | | | | | | and rebase. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| | * more work in progress on mesh physics - still non-functionaldahlia2010-10-141-2/+67
| | |
| | * laying some groundwork for mesh physicsdahlia2010-10-141-70/+80
| | |
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-144-108/+171
| | |\
| | | * 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
| | | * Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ↵Diva Canto2010-10-142-105/+164
| | | | | | | | | | | | | | | | to be generating xml's that are successfully parsed. Needs more testing.
| | * | * 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.
| | * Added SOP.MediaUrl and Shape.Media to the deserializationDiva Canto2010-10-131-204/+14
| | |
* | | Actually set the PrivateBinPath in XEngine so relocating the scriptsMelanie2010-10-162-6/+7
|/ / | | | | | | directory works
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-132-7/+1381
|\ \ | |/
| * Comment a debug message so that it doesn't spew the console upon ↵Diva Canto2010-10-131-1/+1
| | | | | | | | encountering unknown xml elements.
| * New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for ↵Diva Canto2010-10-132-7/+1381
| | | | | | | | load oar and load xml2, but not for packing objects on crossings/TPs yet.
* | change default next owner persm to mod/trans to match SL.Melanie2010-10-131-1/+4
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-102-14/+15
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Add group invites to the list of messages that get offlinedMelanie2010-10-102-14/+15
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-102-3/+11
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-102-3/+11
| |\ \
| | * | * Make line endings consistant in Meshmerizer.csTeravus Ovares (Dan Olivares)2010-10-091-1/+1
| | | |
| | * | 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.
| * | | Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
| |/ / | | | | | | | | | of the child prim because using the child prim plain doesn't work.
* | | Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
| |/ |/| | | | | of the child prim because using the child prim plain doesn't work.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-092-4/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
generated by cgit v1.1 at 2024-12-17 05:31:59 +0000