aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-173-120/+86
|\ \ \ \ | |/ / /
| * | | 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.
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-174-5/+105
|\ \ \ | | |/ | |/|
| * | 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>
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-161-1/+1
|\ \ \ | |/ /
| * | typical non-effectual build triggerTeravus Ovares (Dan Olivares)2010-10-161-1/+1
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-161-1/+1
|\ \ \ | |/ /
| * | Add missing check for !_projectionEntryBlueWall2010-10-161-1/+1
| |/ | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>