Commit Graph

13524 Commits (4d1f0c5348f9a59501f81c4d4ce061db309b5d8a)

Author SHA1 Message Date
Master ScienceSim 9132e251aa Made the check for texture assets asynchronous. This is one part of
a bigger clean up that needs to happen around locks on appearance.
2010-10-26 12:53:15 -07:00
Master ScienceSim 6e58c3d563 Half of the compatibility is working. Login into a new region with
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
2010-10-25 14:11:47 -07:00
Mic Bowman 657cceb884 Intermediate commit for backward compatability; does not compile yet 2010-10-25 09:42:28 -07:00
Latif Khalifa c74c1620a1 * Updated libomv to r3461
Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
2010-10-24 23:51:46 +01:00
Melanie 852c61aaa6 Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL 2010-10-24 18:17:21 +01:00
Diva Canto 627d1a42fe Added inner exception handling in Shape deserialization processing, so that the whole Shape processing returns a valid Shape object. 2010-10-23 20:39:41 -07:00
Justin Clark-Casey (justincc) 80f90229e5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-10-22 23:56:58 +01:00
Justin Clark-Casey (justincc) fe8d3d5a2b Revert "Merge remote branch 'otakup0pe/mantis5110'"
This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
2010-10-22 23:52:07 +01:00
Justin Clark-Casey (justincc) 21187f459e Merge remote branch 'otakup0pe/mantis5110' 2010-10-22 23:35:07 +01:00
Justin Clark-Casey (justincc) 8f34e46d74 Revert "* refactor refactor refactor ServerURI 4 lyfe"
This reverts commit 55974df14b.
2010-10-22 23:35:01 +01:00
Justin Clark-Casey (justincc) 783b1b548f Revert "* additional serveruri cleanup"
This reverts commit 19119d7705.
2010-10-22 23:34:53 +01:00
Jonathan Freedman 38e76d71ac Merge branch 'hg16' into mantis5110 2010-10-22 18:34:50 -04:00
Justin Clark-Casey (justincc) a490b34b6e Revert "* more url / hg cleanup"
This reverts commit 58f75fa19d.
2010-10-22 23:34:44 +01:00
Justin Clark-Casey (justincc) cddcb53b17 Revert "* remove some spurious debug info"
This reverts commit 017b83d0a3.
2010-10-22 23:34:37 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) a7a8fdc7da print IAR version number on console when saving 2010-10-22 18:33:52 -04:00
Justin Clark-Casey (justincc) bdd6857006 Implement guard against trying to load incompatible version IARs 2010-10-22 18:33:47 -04:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 772dbf59f3 slightly simplify oar control file loading code 2010-10-22 18:33:35 -04:00
Justin Clark-Casey (justincc) 460b9fffe5 write IAR control file first in the archive rather than last 2010-10-22 18:33:32 -04:00
Justin Clark-Casey (justincc) e06acae965 Allow region modules to know which agents actually receive chat 2010-10-22 18:33:19 -04:00
AdelleF 481a44104e This fixes a delay in llSetLinkPrimitiveParamsFast
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-22 18:33:10 -04:00
Melanie 004b395d12 Make SImStatsReporter pick ObjectCapacity striaght out of region info 2010-10-22 18:27:49 -04:00
Melanie 170c5d183b Remove a bit of dead code relating to ObjectCapacity 2010-10-22 18:27:40 -04:00
Melanie 753137e9ad Fix the OOB error (#5102). Sorry, my bad. 2010-10-22 18:27:28 -04:00
Melanie 6049e548a5 Skip empty strings in ParseString* functions 2010-10-22 18:27:12 -04:00
Melanie 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
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
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
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
AdelleF 529fb58b7b This fixes a delay in llSetLinkPrimitiveParamsFast
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-21 12:56:36 -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
Melanie bb78f1c05a Make SImStatsReporter pick ObjectCapacity striaght out of region info 2010-10-21 15:36:32 +01:00
Melanie 338e7481f9 Remove a bit of dead code relating to ObjectCapacity 2010-10-21 13:21:46 +01:00
Melanie 01bc4fc9da Fix the OOB error (#5102). Sorry, my bad. 2010-10-21 09:30:09 +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