80f90229e5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-22 23:56:58 +01:00
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e8f34e46d74
2010-10-22 23:52:07 +01:00
21187f459e
Merge remote branch 'otakup0pe/mantis5110'
2010-10-22 23:35:07 +01:00
8f34e46d74
Revert "* refactor refactor refactor ServerURI 4 lyfe"
...
This reverts commit 55974df14b
2010-10-22 23:35:01 +01:00
783b1b548f
Revert "* additional serveruri cleanup"
...
This reverts commit 19119d7705
2010-10-22 23:34:53 +01:00
38e76d71ac
Merge branch 'hg16' into mantis5110
2010-10-22 18:34:50 -04:00
a490b34b6e
Revert "* more url / hg cleanup"
...
This reverts commit 58f75fa19d
2010-10-22 23:34:44 +01:00
cddcb53b17
Revert "* remove some spurious debug info"
...
This reverts commit 017b83d0a3
2010-10-22 23:34:37 +01:00
d58967be58
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
...
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
2010-10-22 18:33:59 -04:00
6d7ce63085
Allow OARs and IARs to save and load meshes.
...
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem. Needs more investigation.
2010-10-22 18:33:55 -04:00
a7a8fdc7da
print IAR version number on console when saving
2010-10-22 18:33:52 -04:00
bdd6857006
Implement guard against trying to load incompatible version IARs
2010-10-22 18:33:47 -04:00
607c07b4aa
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 18:33:41 -04:00
772dbf59f3
slightly simplify oar control file loading code
2010-10-22 18:33:35 -04:00
460b9fffe5
write IAR control file first in the archive rather than last
2010-10-22 18:33:32 -04:00
e06acae965
Allow region modules to know which agents actually receive chat
2010-10-22 18:33:19 -04:00
481a44104e
This fixes a delay in llSetLinkPrimitiveParamsFast
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-22 18:33:10 -04:00
004b395d12
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-22 18:27:49 -04:00
170c5d183b
Remove a bit of dead code relating to ObjectCapacity
2010-10-22 18:27:40 -04:00
753137e9ad
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-22 18:27:28 -04:00
6049e548a5
Skip empty strings in ParseString* functions
2010-10-22 18:27:12 -04:00
700f4ddea4
Change some exception to use ToString(). e.Message is not sufficient to fix
...
errors. Please don't use e.Message, devs NEED to see the dumps!
2010-10-22 22:55:07 +01:00
cfbaad3669
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
...
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
2010-10-22 21:28:10 +01:00
1064e743be
Allow OARs and IARs to save and load meshes.
...
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem. Needs more investigation.
2010-10-22 21:12:22 +01:00
e6019dd6ac
print IAR version number on console when saving
2010-10-22 19:34:06 +01:00
7f2d844916
Implement guard against trying to load incompatible version IARs
2010-10-22 19:30:15 +01:00
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
a5bb7b8a30
slightly simplify oar control file loading code
2010-10-22 18:47:38 +01:00
bb28726a8b
write IAR control file first in the archive rather than last
2010-10-22 18:39:40 +01:00
d4144bedb8
* change the data exchanged within hypergrid transactions
2010-10-21 23:22:15 -04:00
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
62a0910355
Allow region modules to know which agents actually receive chat
2010-10-22 01:01:56 +01:00
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
529fb58b7b
This fixes a delay in llSetLinkPrimitiveParamsFast
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-21 12:56:36 -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
bb78f1c05a
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-21 15:36:32 +01:00
338e7481f9
Remove a bit of dead code relating to ObjectCapacity
2010-10-21 13:21:46 +01:00
01bc4fc9da
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-21 09:30:09 +01:00
1f7577b735
Skip empty strings in ParseString* functions
2010-10-21 07:19:10 +01: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
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
Justin Clark-Casey (justincc)