ede446cad6
add stub media-on-a-prim (shared media) module
2010-07-26 23:34:17 +01:00
09231b1d12
add mssql support for media on a prim
...
compiles but not tested. please test and correct if necessary!
2010-07-26 23:26:22 +01:00
d00466f09a
add mysql support for media on a prim
2010-07-26 23:19:31 +01:00
f34795c6b3
provide config option for media on a prim
2010-07-26 21:41:39 +01:00
d5e8272ad4
relocate serialization code from SQLiteRegionData to MoapModule using load and save events.
...
This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future.
Remaining non-modularity:
PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer.
The database also needs to know about MediaRaw though not about Media.
IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
2010-07-26 21:09:54 +01:00
c70d57ff98
Add EventManager.OnSceneObjectPreSave() for future use. This is triggered immediately before a copy of the group is persisted to storage
2010-07-26 20:36:28 +01:00
491b8181ad
Add EventManager.OnSceneObjectLoaded() for future use. This is fired immediately after a scene object is loaded from storage.
2010-07-26 20:13:26 +01:00
4736e38e79
Put a wrapper around the media texture region serialization
...
THIS WILL BREAK EXISTING MEDIA TEXTURE PERSISTENCE. Please delete your existing sqlite databases if you are experimenting with this branch.
This wrapper will make it easier to maintain compatibility if the media texture data evolves.
This will also make it easier to store non-sl media texture data.
2010-07-26 19:56:55 +01:00
3e97b3ae33
Fix the XMREngine not starting scripts on region startup. Turns out it
...
was a dumb merge artefact that caused it.
2010-07-25 21:55:31 +02:00
516ec4acd0
Eat a lockign exception that kills scripts. May bear more investigation
...
in the long run.
2010-07-25 08:11:39 +02:00
aa7cadca52
Add some options
2010-07-24 23:36:07 +01:00
a9b7774fe0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-24 23:15:38 +01:00
4dbff62ef5
Fix some inventory issues
2010-07-24 23:15:06 +01:00
8e137e31cd
Fix the XmlRpcRouterModule so it reads from the correct config section ([XMLRPC] not [Startup]) and disable by default (since it's disabled in the ini by default)
2010-07-24 11:34:43 -07:00
81186e76b6
Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the xmlrpc_uri event if it's not mentioned in the ini.
2010-07-24 10:43:57 -07:00
1a03a0b281
remove compile.bat from a created binary distribution
2010-07-23 23:12:30 +01:00
2f6fa373ef
in nant distbin, specifically only delete Regions.ini instead of the entire Regions directory
2010-07-23 22:36:03 +01:00
3057974f31
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-07-22 18:06:16 -07:00
bfd883f533
... Then, make sure we also check the old-style module stack before we throw a tantrum
2010-07-22 18:05:56 -07:00
da5b7e199a
First, change DefaultPermissionsModule so it returns the correct name...
2010-07-22 18:04:55 -07:00
64cc76bd79
Fix up the name of the default permissions module to match it's config name
2010-07-23 01:32:29 +02:00
83aec1ec94
Fix a little infinite recursion i added just for sh.ts and giggles. NOT.
2010-07-22 23:47:10 +02:00
bf374705c6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-07-22 10:49:14 -07:00
9ce2f95f37
Add config option securePermissionsLoading which will stop the region from loading if the specified permissions modules fail to load.
2010-07-22 10:46:57 -07:00
7ebabf185e
change the delay to 0.2s. My bad.
2010-07-22 19:31:02 +02:00
ce8b9b4181
LSL compatibility fix. Add 0.1 s sleep to llSetLinkPrimitiveParams so fade scripts will time correctly. The -Fast version works without a delay
2010-07-22 19:20:09 +02:00
0c0ac65d38
Added ': ' to password prompt. Mantis #4851
2010-07-22 04:00:24 -07:00
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
316854dc13
Allow megaregions to be used in M7, should we so decide
2010-07-21 19:25:40 +01:00
9136e02ed3
Merge branch '0.6.9-post-fixes' into careminster
2010-07-21 19:24:18 +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
1d6735f0ec
Fix the XML serializationt to provide an empty script state element if
...
the script hasn't yet saved state, or can't save state because of a loop
2010-07-20 21:47:28 +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
Justin Clark-Casey (justincc)