aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-202-8/+379
|\
| * 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.
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1813-67/+123
|\ \ | |/
| * Add 'contributors' notice for zlib.net.dll to keep track of its origin and ↵Justin Clark-Casey (justincc)2010-10-191-0/+1
| | | | | | | | version. Dahlia, please correct the details if they're wrong.
| * 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-1915-175/+292
| |\ \ | | |/
| | * 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-187-165/+180
| | |\
| | | * remove some cruft from last commitdahlia2010-10-181-8/+0
| | | |
| | | * initial support for meshies physics. Must set ini option ↵dahlia2010-10-184-44/+101
| | | | | | | | | | | | | | | | UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example.
| | * | Bump migration version on LastSeen field so it is actually runMelanie2010-10-181-1/+1
| | | |
| * | | Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC ↵Justin Clark-Casey (justincc)2010-10-192-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | groups module This allows the groups xmlrpc server to act appropriately if the requesting agent has permission to see all group members Not sure why this wasn't being done before...
| * | | Display more information when xmlrpcgroupsserver comms failsJustin Clark-Casey (justincc)2010-10-192-13/+14
| | | | | | | | | | | | | | | | Improve debugging messages
* | | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1740-28231/+30424
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-10-175-7/+107
| |\ \ \ | | | |/ | | |/|
| | * | Adding osFunctions for light projectionBlueWall2010-10-174-5/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | typical non-effectual build triggerTeravus Ovares (Dan Olivares)2010-10-161-1/+1
| | | |
| | * | Add missing check for !_projectionEntryBlueWall2010-10-161-1/+1
| | |/ | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.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.
| * 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-1511-143/+189
| | | | | | | | 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>.
| * UPdated the MySql driver to 6.2.4. Also established a much larger ↵Diva Canto2010-10-152-0/+1
| | | | | | | | MySqlCommand timeout on fetching prims.
| * Adding projected light filters to prim propetiesBlueWall2010-10-151-0/+80
| | | | | | | | | | Requires the LL Mesh Beta viewer Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| * 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-150-0/+0
| |\
| | * one more silly line ending thing....Teravus Ovares (Dan Olivares)2010-10-141-71/+71
| | | | | | | | | | | | *If you have problems, fetch the tree and rebase.
| * | 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-143-24/+75
| |
| * libomv update to support headerless llsd binary deserialization needed for ↵Latif Khalifa2010-10-146-6/+63
| | | | | | | | | | | | mesh asset decoding Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| * 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
| |/