27aac37c02
Merge branch 'master' of /var/git/opensim/
2010-10-21 12:10:04 -07:00
fe99f194ad
Deleted a verbose and unneeded log message.
2010-10-21 12:00:30 -07:00
08e14d653e
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
2010-10-21 17:09:42 +01:00
e62bef2e90
Merge branch 'master' of /var/git/opensim/
2010-10-21 08:30:12 -07:00
bb78f1c05a
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-21 15:36:32 +01:00
656b2f84a8
Merge branch 'master' of /var/git/opensim/
2010-10-21 06:10:04 -07:00
338e7481f9
Remove a bit of dead code relating to ObjectCapacity
2010-10-21 13:21:46 +01:00
bab7f99865
Merge branch 'master' of /var/git/opensim/
2010-10-21 02:20:04 -07:00
01bc4fc9da
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-21 09:30:09 +01:00
6df87e5b3f
Merge branch 'master' of /var/git/opensim/
2010-10-21 00:10:03 -07:00
1f7577b735
Skip empty strings in ParseString* functions
2010-10-21 07:19:10 +01:00
7a8aba0bc0
Merge branch 'master' of /var/git/opensim/
2010-10-20 20:50:06 -07:00
f8a47801ee
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-20 20:43:08 -07:00
9038218c2d
fix combining of multiple physics submeshes
2010-10-20 20:39:05 -07:00
dfa654154c
Merge branch 'master' of /var/git/opensim/
2010-10-20 19:40:09 -07:00
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
58f75fa19d
* more url / hg cleanup
2010-10-20 22:21:45 -04:00
19119d7705
* additional serveruri cleanup
2010-10-20 22:21:41 -04:00
55974df14b
* refactor refactor refactor ServerURI 4 lyfe
2010-10-20 22:21:23 -04:00
335f2ddad2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 20:26:37 -04:00
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
94684a2251
* remove some spurious debug info
2010-10-20 02:36:59 -04:00
b2478b41c8
Merge branch 'master' of /var/git/opensim/
2010-10-19 22:30:05 -07:00
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
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
436816276b
Merge branch 'master' of /var/git/opensim/
2010-10-19 21:50:06 -07:00
087cb951e2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 00:43:29 -04:00
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
5eca61585d
SendAnimations from SIM->CM->client
2010-10-19 15:47:06 -07:00
d54b25baaa
Merge branch 'master' of /var/git/opensim/
2010-10-19 15:20:04 -07:00
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
d95982137a
Merge branch 'master' of /var/git/opensim/
2010-10-19 15:10:03 -07:00
8acac3d07f
Another take related to the previous commit.
2010-10-19 15:07:15 -07:00
5110366baf
Merge branch 'master' of /var/git/opensim/
2010-10-19 14:40:08 -07:00
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
3b9a6a565f
touch and world chat working
2010-10-19 14:06:59 -07:00
134eaf67bf
Merge branch 'master' of /var/git/opensim/
2010-10-19 00:10:03 -07:00
684449f783
Added TextureAnimation and ParticleSystem to serialization.
2010-10-19 00:04:02 -07:00
4eb05dabf4
Merge branch 'master' of /var/git/opensim/
2010-10-18 23:00:07 -07:00
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
8d38c4593e
Merge branch 'master' of /var/git/opensim/
2010-10-18 20:50:03 -07:00
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
12128f1917
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-18 23:00:48 -04:00
a2475a7b8c
Merge branch 'master' of /var/git/opensim/
2010-10-18 18:30:05 -07:00
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
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
929321de57
Merge branch 'master' of /var/git/opensim/
2010-10-18 18:20:03 -07:00
5dd372edc4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:12:36 +01:00
f6eaa1e6af
Merge branch 'master' of /var/git/opensim/
2010-10-18 18:10:03 -07:00
99388ce610
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:08:50 +01:00
opensim mirror account