aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-2021-166/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | * remove some spurious debug infoJonathan Freedman2010-10-203-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| * | | | | | | | | | | | * more url / hg cleanupJonathan Freedman2010-10-208-45/+56
| | | | | | | | | | | | |
| * | | | | | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-208-54/+20
| | | | | | | | | | | | |
| * | | | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-2014-94/+72
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | 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.
* | | | | | | | | 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.
| | * | | | | | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-10-175-7/+107
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | 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.
| * | | | | | | | | | Bump migration version on LastSeen field so it is actually runMelanie2010-10-181-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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>
* | | | | | | | | 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
* | | | | | | | 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>