Jonathan Freedman
5da2743c37
Merge branch 'master' into mantis5110
2010-10-25 22:27:35 -04: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
Melanie
3113cc9129
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-25 01:24:42 +01:00
Melanie
ac370cf57b
Merge branch 'master' into careminster-presence-refactor
2010-10-25 01:24:30 +01:00
opensim mirror account
a2c0ee8da7
Merge branch 'master' of /var/git/opensim/
2010-10-24 16:40:06 -07:00
Melanie
cf78f3fae3
Comment repeated add and remove of avatars from the physical scene. It's no
...
longer needed.
2010-10-25 00:53:38 +02: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
dd7f9ed7bf
Implement llGetLinkNumberOfSides(), needed for 1-script sculptie foot shoe
...
scripts.
2010-10-25 00:33:34 +02:00
Jonathan Freedman
07db35697b
Merge branch 'master' into mantis5110
2010-10-24 15:01:01 -04:00
Jonathan Freedman
ba9ef44506
Merge branch 'master' into mantis5110
2010-10-24 15:00:24 -04:00
Jonathan Freedman
6b9660eb96
Merge branch 'master' into mantis5110
2010-10-24 14:51:38 -04:00
opensim mirror account
17d3c76116
Merge branch 'master' of /var/git/opensim/
2010-10-24 11:10:07 -07:00
Jonathan Freedman
3fe8fc3d51
* throw debug message when no HomeURI is set
2010-10-24 13:32:34 -04:00
Melanie
852c61aaa6
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:17:21 +01:00
Melanie
61137eac22
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:19:48 +02:00
Melanie
2f0a3391ee
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-24 17:21:16 +02:00
Melanie
5f266fd571
Change the results from llGetPrimitiveParams to be the same as SL for
...
the prim position. This will make attached resizer scripts work like SL.
Existing resizers may be affected adversely.
2010-10-24 17:18:21 +02:00
opensim mirror account
c83453a69b
Merge branch 'master' of /var/git/opensim/
2010-10-23 20:40:07 -07: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
Melanie
d0c707209a
Prevent an exception if a string passed into llXorBase64StringsCorrect is not
...
a base 64 string. Return the empty string in this case.
2010-10-23 22:40:56 +01:00
Jonathan Freedman
5ddb8b535e
* a bit of additional debugging:
2010-10-23 00:18:19 -04:00
Melanie
9a78281f82
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-23 00:22:23 +01:00
Melanie
7f74dc1b14
Merge branch 'master' into careminster-presence-refactor
2010-10-23 00:21:42 +01:00
opensim mirror account
bf5cc32b5f
Merge branch 'master' of /var/git/opensim/
2010-10-22 16:00:06 -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
opensim mirror account
566b96a595
Merge branch 'master' of /var/git/opensim/
2010-10-22 15:50:09 -07:00
opensim mirror account
cc411bf5f3
Merge branch 'master' of /var/git/opensim/
2010-10-22 15:40:08 -07: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
9fa915bdef
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-23 00:20:18 +02:00
Melanie
c3ddf46188
Prevent database lookups on every avatar movement when land is set to group
...
access. Fixes a massive performance degradation.
2010-10-23 00:18:56 +02:00