7b471bb21c
Adding sample configuration to previous patch
2010-07-22 03:04:34 +01:00
a70c7756b3
Add sending of the avatar interests and configuration of the profiles
...
module as an OpenSim profile module to Simian grid services.
Patch by Dimentox, thank you.
Applied with changes.
2010-07-22 03:01:50 +01:00
8e8076c947
also add avatar id to an updated media url - not just new ones
2010-07-21 19:32:05 +01:00
6ef2a72c70
Properly set TextureEntry.MediaFlags when a media texture is set
...
Media flags is cleared via a direct TextureEntry update from the client. If the clearing leaves no media textures on the prim, then a CAP ObjectMediaUpdate is not received. If there are still media textures present then one is received.
This change fixes drag-and-drop on Windows (and Mac?) clients. It may also fix problems with clearing and then subsequently setting new media textures.
2010-07-21 17:12:43 +01:00
8e67f6dc44
start adding user ids to the media urls
2010-07-21 14:25:21 +01:00
fb89d0ff4e
Allow megaregions to be used in M7, should we so decide
2010-07-21 12:32:23 +02:00
d4022becc3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-21 12:16:30 +02:00
f63a4c8f2f
Merge branch 'master' into careminster-presence-refactor
2010-07-21 12:03:44 +01:00
c72c84b455
Refine autoreturn a bit
2010-07-21 12:16:17 +02:00
ac1a34714d
Allow Megaregions to start properly after an unclean shutdown
2010-07-20 23:24:04 +01:00
f08afc4f87
Restore lines that have been removed due to previous merge conflict.
2010-07-20 14:28:17 -07:00
4ccc141764
Resync with master
2010-07-20 21:49:31 +01:00
c0b8cbd85b
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:47:53 +01:00
dcf7973c9b
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:39:20 +01:00
176cb01130
Remove a merge artefact
2010-07-20 21:38:31 +01:00
686837d9ed
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:18:27 +01:00
120d7014fd
When a god uses mass permission setting, the V bit is cleared from next
...
perms, rendering the item unmoveable for the next owenr. Make god mods
conform to the rules, too.
2010-07-20 21:01:46 +01:00
ea51bea508
prevent hacked viewers from being able to delete arbitrary items from any
...
prim. Allow friends with perms and shared group members to move or copy
things out of prims
2010-07-20 21:01:14 +01:00
78605baab3
Fix a few permissions vulnerability. Owners could cause permissions
...
escalation on items contained in prims using a hacked viewer
2010-07-20 21:00:56 +01:00
e46c0a0fc9
adjust DialogModule to only send broadcast alerts to root agents
2010-07-20 21:32:13 +01:00
7c124a5543
Relaxed the ultra-conservative lock on m_items. Needs testing under linux and stress.
2010-07-20 05:59:18 -07:00
fd66ee57f3
When a god uses mass permission setting, the V bit is cleared from next
...
perms, rendering the item unmoveable for the next owenr. Make god mods
conform to the rules, too.
2010-07-20 14:45:46 +02:00
b7f1288361
Adding it again.
...
Revert "Reverting this for now, but this needs to go in again."
This reverts commit c0d9ab941d
2010-07-20 04:23:39 -07:00
c0d9ab941d
Reverting this for now, but this needs to go in again.
...
Revert "Another stab at http://opensimulator.org/mantis/view.php?id=4858 . Eliminated more nested locks."
This reverts commit ffbae52a13
2010-07-19 16:22:29 -07:00
191bee2ed0
Remove the null checks altogether
2010-07-20 00:55:31 +02:00
54da64acac
Remove exception badness in the LSL Types. Who ever came up with that.....?!
2010-07-20 00:46:39 +02:00
ffbae52a13
Another stab at http://opensimulator.org/mantis/view.php?id=4858 . Eliminated more nested locks.
2010-07-19 15:20:34 -07:00
5c0c7fda6c
One more stab at http://opensimulator.org/mantis/view.php?id=4858 .
...
Eliminated the nested locks of m_Scripts and m_PrimObjects.
2010-07-19 13:59:11 -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
c263fc54ac
Add a state change method to the Async commands handler to allow timers
...
and http requests to survive state changes
2010-07-18 21:05:50 +02:00
c088397ec7
If the client requests that an object be deleted, and the SOG/SOP is null and/or is marked as deleted, just send the KillObject
2010-07-18 06:01:26 -07:00
fabe2206db
Ensure that packets do NOT get delivered to a client before the modules that can deal with the client's response have finished loading.
2010-07-17 15:08:59 -07:00
17412389f3
Revert 233c872.. "* Call client.Start() sunchronously. Calling thos async avoids some stuttering", pending fix for the core issue
2010-07-17 14:34:35 -07: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
ef6565470f
XGitminster: Update config options; commitFrameInterval -> CommitInterval and a new option DisableNonEssentialCommits
2010-07-17 06:54:46 -07:00
d52fb4d2e9
Shorten LLEmail delay to 15s. With the external spam protection, we can
...
afford to do that
2010-07-17 16:35:14 +02:00
22371ac527
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-17 16:33:31 +02:00
c41d418380
Allow communicating with blue box dialogs across a region border via a
...
child agent
2010-07-17 16:32:55 +02:00
859e3252be
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-17 03:18:01 +01:00
d1040c9ff9
Replace the screenful of code i deleted.
2010-07-17 02:46:04 +02:00
e06b7ee368
Make webloading more robust by addign retries
2010-07-17 02:38:00 +02:00
85f454e3ae
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-17 02:26:34 +02:00
9bf6179d24
Fix scripted give of items
2010-07-17 02:26:09 +02: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
Melanie