Commit Graph

14807 Commits (e05f728b084d66de964b8d7fa0a9318b94526c4e)

Author SHA1 Message Date
Melanie fc33d569cd Merge branch 'master' into careminster-presence-refactor 2010-10-21 07:33:01 +01:00
Melanie 1f7577b735 Skip empty strings in ParseString* functions 2010-10-21 07:19:10 +01:00
dahlia f8a47801ee Merge branch 'master' of ssh://MyConnection01/var/git/opensim 2010-10-20 20:43:08 -07:00
dahlia 9038218c2d fix combining of multiple physics submeshes 2010-10-20 20:39:05 -07:00
Jonathan Freedman 017b83d0a3 * remove some spurious debug info
* 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>
2010-10-20 22:36:29 -04:00
Jonathan Freedman 58f75fa19d * more url / hg cleanup 2010-10-20 22:21:45 -04:00
Jonathan Freedman 19119d7705 * additional serveruri cleanup 2010-10-20 22:21:41 -04:00
Jonathan Freedman 55974df14b * refactor refactor refactor ServerURI 4 lyfe 2010-10-20 22:21:23 -04:00
Jonathan Freedman 335f2ddad2 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-20 20:26:37 -04:00
Master ScienceSim b1c8d05888 Major refactoring of appearance handling.
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.

AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.

AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.

AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
2010-10-20 16:17:54 -07:00
Jonathan Freedman 94684a2251 * remove some spurious debug info 2010-10-20 02:36:59 -04:00
opensim mirror account b2478b41c8 Merge branch 'master' of /var/git/opensim/ 2010-10-19 22:30:05 -07:00
Diva Canto a7acb650d4 Deleted verbose debug messages that are bringing sims to an halt. Increased the user cache expiration period to 33 hours. 2010-10-19 22:26:07 -07:00
Teravus Ovares (Dan Olivares) 9f975ad5aa * One more goofy thing. I note that the sculpt texture id is broken out of 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. 2010-10-20 01:23:54 -04:00
opensim mirror account 436816276b Merge branch 'master' of /var/git/opensim/ 2010-10-19 21:50:06 -07:00
Jonathan Freedman 087cb951e2 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-20 00:43:29 -04:00
Teravus Ovares (Dan Olivares) edce4e9c67 * This removes an ugly extraparams hack that I used and makes UploadObjectAsset into a generic linkset upload tool. 2010-10-20 00:40:05 -04:00
opensim mirror account d54b25baaa Merge branch 'master' of /var/git/opensim/ 2010-10-19 15:20:04 -07:00
Diva Canto 8731c2be11 It looks like Vector3s also got written down in lower case at some point in 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.
2010-10-19 15:16:29 -07:00
opensim mirror account d95982137a Merge branch 'master' of /var/git/opensim/ 2010-10-19 15:10:03 -07:00
Diva Canto 8acac3d07f Another take related to the previous commit. 2010-10-19 15:07:15 -07:00
opensim mirror account 5110366baf Merge branch 'master' of /var/git/opensim/ 2010-10-19 14:40:08 -07:00
Diva Canto 3b2d9a9939 Added code to quaternion deserialization to try to cope with an exception 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.
2010-10-19 14:37:03 -07:00
opensim mirror account 134eaf67bf Merge branch 'master' of /var/git/opensim/ 2010-10-19 00:10:03 -07:00
Diva Canto 684449f783 Added TextureAnimation and ParticleSystem to serialization. 2010-10-19 00:04:02 -07:00
opensim mirror account 4eb05dabf4 Merge branch 'master' of /var/git/opensim/ 2010-10-18 23:00:07 -07:00
Teravus Ovares (Dan Olivares) b2c1a1c9bd * This concludes UploadObjectAsset for now until the permissions and physics 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
2010-10-19 01:53:56 -04:00
opensim mirror account 8d38c4593e Merge branch 'master' of /var/git/opensim/ 2010-10-18 20:50:03 -07:00
Teravus Ovares (Dan Olivares) 158e43d4fd * Almost complete implementation of UploadObjectAsset cap. all meshes get uploaded but they're improperly positioned/oriented at the moment. 2010-10-18 23:47:35 -04:00
Jonathan Freedman 12128f1917 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-18 23:00:48 -04:00
opensim mirror account a2475a7b8c Merge branch 'master' of /var/git/opensim/ 2010-10-18 18:30:05 -07:00
Justin Clark-Casey (justincc) e561070d3f Add 'contributors' notice for zlib.net.dll to keep track of its origin and version. Dahlia, please correct the details if they're wrong. 2010-10-19 02:28:10 +01:00
Justin Clark-Casey (justincc) 37a6be7ca9 Stop the InventoryTransferModule logging every IM notification it receives, even if they are nothing to do with it. 2010-10-19 02:20:47 +01:00
opensim mirror account 929321de57 Merge branch 'master' of /var/git/opensim/ 2010-10-18 18:20:03 -07:00
Justin Clark-Casey (justincc) 5dd372edc4 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-10-19 02:12:36 +01:00
opensim mirror account f6eaa1e6af Merge branch 'master' of /var/git/opensim/ 2010-10-18 18:10:03 -07:00
Justin Clark-Casey (justincc) 99388ce610 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-10-19 02:08:50 +01:00
Justin Clark-Casey (justincc) 478b44f231 Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC 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...
2010-10-19 02:04:23 +01:00
Justin Clark-Casey (justincc) b9bef50852 Display more information when xmlrpcgroupsserver comms fails
Improve debugging messages
2010-10-19 02:04:14 +01:00
opensim mirror account 963b129389 Merge branch 'master' of /var/git/opensim/ 2010-10-18 17:40:03 -07:00
Melanie 43a4b7b735 COmmented the wrong line instead, now I commented them all to be on the safe side 2010-10-19 01:23:25 +01:00
Melanie 8853c21763 COmmented the wrong line instead, now I commented them all to be on the safe side 2010-10-19 01:22:31 +01:00
Melanie e0a02d6ca3 Merge branch 'master' into careminster-presence-refactor 2010-10-19 00:52:35 +01:00
Melanie 5b29b975ee Comment a spammy debug message in the serializer 2010-10-19 00:51:04 +01:00
opensim mirror account 48127ba943 Merge branch 'master' of /var/git/opensim/ 2010-10-18 15:50:04 -07:00
Melanie 7de30cc57b Change substring matching to prefix matching in region search. This affects
both map and login, as they use the same method.
2010-10-18 22:59:00 +01:00
Melanie ce3594f7f2 Change substring matching to prefix matching in region search. This affects
both map and login, as they use the same method.
2010-10-18 22:58:04 +01:00
opensim mirror account da29a1a1a1 Merge branch 'master' of /var/git/opensim/ 2010-10-18 13:20:03 -07:00
Melanie 551015db63 Alphabetize results on region search by prefix matching 2010-10-18 20:29:00 +01:00
opensim mirror account bc6a9cf8ba Merge branch 'master' of /var/git/opensim/ 2010-10-18 12:00:10 -07:00