ae4964050b
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-07-19 13:05:36 -07:00
9ada2a1f34
Client manager changes as of R@I
2010-07-19 13:03:04 -07:00
cd2bb7daf3
Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests indicate that this is what causes deadlock. More tests needed.
2010-07-19 08:07:37 -07:00
a974704a3e
re-add the sleep lost in the revert.
2010-07-19 14:37:27 +01:00
575f7d3366
Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage"
...
This reverts commit c404c5fb54
2010-07-19 14:36:53 +01:00
fa45d5b5fa
Revert "A stab in the dark. Revert the compile lockout temporarily. If you know what"
...
This reverts commit f798679b80
2010-07-19 01:10:57 +01:00
f798679b80
A stab in the dark. Revert the compile lockout temporarily. If you know what
...
this is, you should test it. If you don't, don't use it.
2010-07-19 00:06:23 +01:00
7b62c25cfb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-17 16:25:56 +01:00
e157dd630e
Allow communicating with blue box dialogs across a region border via a
...
child agent
2010-07-17 16:25:30 +01:00
9cfa71d1bf
Allow use of old angle rules PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE in llParticleSystem()
...
This is a patch from http://opensimulator.org/mantis/view.php?id=3201
Thanks Micheil Martin!
2010-07-17 00:35:51 +01:00
e05f01e70f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-17 00:27:52 +01:00
f5bdf0d9b9
Fix bugs in llRot2Euler()
...
Applies patch in http://opensimulator.org/mantis/view.php?id=4482 .
Thanks Micheil Merlin!
2010-07-17 00:26:26 +01:00
2c3207df07
add missing regionstore migration file for new fields. D'oh!
...
this should enable persistence now
2010-07-15 23:28:36 +01:00
0bec4f5ea5
Handle checking of line starting "*" wildcard for whitelist patterns
...
A line starting * can only be applied to the domain, not the path
2010-07-15 21:51:57 +01:00
2ec6e3b440
refactor: simplify current whitelist url checking by using System.Uri
2010-07-15 21:40:44 +01:00
610a2626a5
Implement * end wildcard for whitelist urls
2010-07-15 21:14:55 +01:00
b75fc97865
Fixes mantis #4872 . Port for GridInfo was wrong in Robust.HG.ini.example
2010-07-15 03:34:03 -07:00
e74e591e0b
properly expose prim media LSL functions to scripts
...
scripts using these functions should now compile but I don't know how well the methods themselves work yet
llSetPrimMedia(), at least, appears to have problems when a current url is set for a face that doesn't yet have a texture
2010-07-15 00:15:23 +01:00
aec3b33011
fix bug where prim persistence would fail if media had never been set
2010-07-14 23:48:24 +01:00
99a6950b30
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 23:29:04 +01:00
c3ee451325
fix previous media interact serverside checking. perform very basic serverside url whitelist checks
...
at the moment, only checking for the exact name prefix is implemented
for some reason, whitelists are not persisting
this commit also fixes a very recent problem where setting any media texture parameters after the initial configuration would not work
2010-07-14 23:26:24 +01:00
466254105c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-14 23:04:25 +01:00
264f4f07cd
Detach attachments displaced by other attachments
2010-07-14 23:04:05 +01:00
0d8c0811d3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 14:48:14 -07:00
6afa55d446
Removed a few obsolete mono addin references. Mantis #4854
2010-07-14 14:47:01 -07:00
8c10cb5ffe
improve closing of load/save iar streams in the event of a problem
2010-07-14 20:43:35 +01:00
e1ea82b329
Major attachments cleanup. Remove unused AttachObject ClientView method
...
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:51:12 +01:00
a7b5fe6a88
Remove useless quaternion parameter from AttachObject sig
2010-07-14 19:49:54 +01:00
b8aa81635f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 11:04:57 -07:00
12858122d5
Fixes mantis #4870 .
2010-07-14 11:02:41 -07:00
5b03e05035
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 17:55:06 +01:00
5d83b3f991
comment out obsolete assert that 'item has been passed to another user since it was last set' perms flag was set when a prim item was added to a scene object
2010-07-14 17:53:43 +01:00
0080c3b1f4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 17:13:04 +01:00
71433075a9
Fix obvious bug in XInventoryService.GetFolderItems() which was preventing the iar module from being able to save single item iars
2010-07-14 17:12:12 +01:00
2291daa95a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-14 16:13:21 +01:00
e17591f4cf
Cleaned up a couple of things from OpenSim.ini.example: [Friends] section has been in other inis for a while, not needed here; and [Network] remoteDataPort is obsolete.
2010-07-14 08:52:22 -07:00
39cd57598b
Fix a permissions issue
2010-07-14 16:12:44 +01:00
33aa7ba7dc
Revert "More on mantis #4869 . This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing."
...
Cuauses a permission escalation. do NOT USE the preceding commit
2010-07-14 14:59:34 +01:00
bec1d7cc36
Removed left-over debug messages.
2010-07-14 07:00:24 -07:00
87fb19162e
More on mantis #4869 . This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing.
2010-07-14 06:57:56 -07:00
d64c09160c
Removed some more debug messages.
2010-07-14 04:18:13 -07:00
cd8bb316ea
Remove getting the object capacity from the money module. It is now set
...
directly from the Region Info (and the region ini file)
2010-07-14 03:51:00 +01:00
e44e1ccbd3
implement code to deregister users on DeregisterCaps
2010-07-14 00:16:37 +01:00
a4c6c4de91
implement serverside checks for media texture navigation in order to stop naughty clients
2010-07-13 23:58:19 +01:00
2ad9789b1c
factor out soon to be common media permissions check code
2010-07-13 23:46:49 +01:00
6f644f5322
implement prim media control permissions serverside in order to stop bad clients
2010-07-13 23:19:45 +01:00
dd14016885
Revamp the permissions propagation. This MAY mess up. Please test.
...
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
2010-07-13 20:45:16 +01:00
bed36901d1
Add CreateSelected flag onto objects rezzed from inventory
2010-07-13 20:37:12 +01:00
1a1d42db83
discard an object media update message if it tries to set more media textures than the prim has faces
2010-07-13 19:28:07 +01:00
86f3f83250
uncomment a load iar code line I accidentally commented in the last commit
...
hooray for automated tests
2010-07-12 23:37:08 +01:00
Dan Lake