a51a545cb9
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-10-28 13:24:45 +01:00
71d9fac757
Merge branch 'master' of /var/git/opensim/
2010-10-27 21:40:03 -07:00
727838f914
Formatting cleanup.
2010-10-28 00:37:32 -04:00
0269ec6af0
Merge branch 'master' of /var/git/opensim/
2010-10-27 13:40:10 -07:00
05dbe4f2c4
Merge branch 'master' into careminster-presence-refactor
2010-10-27 20:49:27 +01:00
1fcac7203d
Prevent nullrefs in scene object deletion. Mantis #5156
2010-10-27 20:47:27 +01:00
6f297a50cb
Merge branch 'master' of /var/git/opensim/
2010-10-26 21:30:05 -07:00
a4e95c0717
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-26 21:20:18 -07:00
5968d343bb
Overload Scene.NewUserConnection() to facilitate NPCs and other region specific applications
2010-10-26 21:19:33 -07:00
d6771ed4d5
Merge branch 'master' of /var/git/opensim/
2010-10-26 21:10:12 -07:00
a331fd4e24
Formatting cleanup.
2010-10-27 00:01:03 -04:00
9cfd3e1d5a
Small cleanup and add more debugging information
2010-10-26 12:54:28 -07:00
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
5da2743c37
Merge branch 'master' into mantis5110
2010-10-25 22:27:35 -04:00
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
657cceb884
Intermediate commit for backward compatability; does not compile yet
2010-10-25 09:42:28 -07:00
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
ac370cf57b
Merge branch 'master' into careminster-presence-refactor
2010-10-25 01:24:30 +01:00
a2c0ee8da7
Merge branch 'master' of /var/git/opensim/
2010-10-24 16:40:06 -07:00
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
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
dd7f9ed7bf
Implement llGetLinkNumberOfSides(), needed for 1-script sculptie foot shoe
...
scripts.
2010-10-25 00:33:34 +02:00
07db35697b
Merge branch 'master' into mantis5110
2010-10-24 15:01:01 -04:00
ba9ef44506
Merge branch 'master' into mantis5110
2010-10-24 15:00:24 -04:00
6b9660eb96
Merge branch 'master' into mantis5110
2010-10-24 14:51:38 -04:00
17d3c76116
Merge branch 'master' of /var/git/opensim/
2010-10-24 11:10:07 -07:00
3fe8fc3d51
* throw debug message when no HomeURI is set
2010-10-24 13:32:34 -04:00
852c61aaa6
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:17:21 +01:00
61137eac22
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:19:48 +02:00
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
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
c83453a69b
Merge branch 'master' of /var/git/opensim/
2010-10-23 20:40:07 -07:00
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
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
5ddb8b535e
* a bit of additional debugging:
2010-10-23 00:18:19 -04:00
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
7f74dc1b14
Merge branch 'master' into careminster-presence-refactor
2010-10-23 00:21:42 +01:00
bf5cc32b5f
Merge branch 'master' of /var/git/opensim/
2010-10-22 16:00:06 -07:00
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
566b96a595
Merge branch 'master' of /var/git/opensim/
2010-10-22 15:50:09 -07:00
cc411bf5f3
Merge branch 'master' of /var/git/opensim/
2010-10-22 15:40:08 -07: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
Melanie