aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-0/+6
|\
| * Skip empty strings in ParseString* functionsMelanie2010-10-211-0/+6
| |
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-201-3/+4
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-2021-166/+123
| |\
| * | fix combining of multiple physics submeshesdahlia2010-10-201-3/+4
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-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
| |/
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-193-4/+7
|\ \ | |/
| * 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.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-17/+62
|\ \ | |/
| * * 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.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-3/+3
|\ \ | |/
| * 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.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-13/+17
|\ \ | |/
| * Another take related to the previous commit.Diva Canto2010-10-191-13/+17
| |
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-4/+15
|\ \ | |/
| * 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.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-0/+27
|\ \ | |/
| * Added TextureAnimation and ParticleSystem to serialization.Diva Canto2010-10-191-0/+27
| |
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-48/+76
|\ \ | |/
| * * 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
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-0/+301
|\ \ | |/
| * * 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 /var/git/opensim/opensim mirror account2010-10-182-3/+4
|\ \ | |/
| * 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 /var/git/opensim/opensim mirror account2010-10-183-14/+18
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-191-2/+2
| |\
| * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-1915-175/+292
| |\ \
| * | | 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 /var/git/opensim/opensim mirror account2010-10-181-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 /var/git/opensim/opensim mirror account2010-10-181-1/+1
|\ \ \ | |/ /
| * | Comment a spammy debug message in the serializerMelanie2010-10-191-1/+1
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-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.
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-0/+2
|\ \ \ | |/ /
| * | Alphabetize results on region search by prefix matchingMelanie2010-10-181-0/+2
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-1/+1
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-187-165/+180
| |\ \
| * | | Bump migration version on LastSeen field so it is actually runMelanie2010-10-181-1/+1
| | | |
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-8/+0
|\ \ \ \ | | |/ / | |/| |
| * | | remove some cruft from last commitdahlia2010-10-181-8/+0
| | | |
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-184-44/+101
|\ \ \ \ | |/ / /
| * | | initial support for meshies physics. Must set ini option ↵dahlia2010-10-184-44/+101
| | | | | | | | | | | | | | | | UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example.