Justin Clark-Casey (justincc)
e6019dd6ac
print IAR version number on console when saving
2010-10-22 19:34:06 +01:00
Justin Clark-Casey (justincc)
7f2d844916
Implement guard against trying to load incompatible version IARs
2010-10-22 19:30:15 +01:00
Justin Clark-Casey (justincc)
199b61f1b2
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 19:24:42 +01:00
Justin Clark-Casey (justincc)
a5bb7b8a30
slightly simplify oar control file loading code
2010-10-22 18:47:38 +01:00
Justin Clark-Casey (justincc)
bb28726a8b
write IAR control file first in the archive rather than last
2010-10-22 18:39:40 +01:00
Jonathan Freedman
d4144bedb8
* change the data exchanged within hypergrid transactions
2010-10-21 23:22:15 -04:00
opensim mirror account
8ffea630f9
Merge branch 'master' of /var/git/opensim/
2010-10-21 18:00:06 -07:00
Justin Clark-Casey (justincc)
e7f184345e
minor: add some text to the oar abort messages on assets timeout to make it clear that the oar will not be usable
2010-10-22 01:52:19 +01:00
opensim mirror account
6f6b5c0a5e
Merge branch 'master' of /var/git/opensim/
2010-10-21 17:30:08 -07:00
Justin Clark-Casey (justincc)
62a0910355
Allow region modules to know which agents actually receive chat
2010-10-22 01:01:56 +01:00
Master ScienceSim
267f18925d
First attempt to get multiple attachments working to support viewer2.
...
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
2010-10-21 16:48:58 -07:00
opensim mirror account
33589ba31b
Merge branch 'master' of /var/git/opensim/
2010-10-21 13:00:05 -07:00
AdelleF
529fb58b7b
This fixes a delay in llSetLinkPrimitiveParamsFast
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-21 12:56:36 -07:00
opensim mirror account
27aac37c02
Merge branch 'master' of /var/git/opensim/
2010-10-21 12:10:04 -07:00
Diva Canto
fe99f194ad
Deleted a verbose and unneeded log message.
2010-10-21 12:00:30 -07:00
Melanie
08e14d653e
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
2010-10-21 17:09:42 +01:00
opensim mirror account
e62bef2e90
Merge branch 'master' of /var/git/opensim/
2010-10-21 08:30:12 -07:00
Melanie
bb78f1c05a
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-21 15:36:32 +01:00
opensim mirror account
656b2f84a8
Merge branch 'master' of /var/git/opensim/
2010-10-21 06:10:04 -07:00
Melanie
338e7481f9
Remove a bit of dead code relating to ObjectCapacity
2010-10-21 13:21:46 +01:00
opensim mirror account
bab7f99865
Merge branch 'master' of /var/git/opensim/
2010-10-21 02:20:04 -07:00
Melanie
01bc4fc9da
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-21 09:30:09 +01:00
opensim mirror account
6df87e5b3f
Merge branch 'master' of /var/git/opensim/
2010-10-21 00:10:03 -07:00
Melanie
1f7577b735
Skip empty strings in ParseString* functions
2010-10-21 07:19:10 +01:00
opensim mirror account
7a8aba0bc0
Merge branch 'master' of /var/git/opensim/
2010-10-20 20:50:06 -07: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
opensim mirror account
dfa654154c
Merge branch 'master' of /var/git/opensim/
2010-10-20 19:40:09 -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
Robert Adams
5eca61585d
SendAnimations from SIM->CM->client
2010-10-19 15:47:06 -07: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
Robert Adams
3b9a6a565f
touch and world chat working
2010-10-19 14:06:59 -07:00
opensim mirror account
134eaf67bf
Merge branch 'master' of /var/git/opensim/
2010-10-19 00:10:03 -07:00