Justin Clark-Casey (justincc)
a9101feb10
factor out soon to be common media permissions check code
2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
51b208e96c
implement prim media control permissions serverside in order to stop bad clients
2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
e5615d3a9b
discard an object media update message if it tries to set more media textures than the prim has faces
2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
eb5e39d6ef
Fire CHANGED_MEDIA event if a media texture is set or cleared
2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
39a38c4901
implement llClearPrimMedia()
...
untested
2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
d1a879927c
fix issue with GetMediaEntry if the face requested wasn't set to a media texture
2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
43f480864b
fix problem persisting when only one face had a media texture
2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc)
c76e2ce250
factor out common code for updating the media url
2010-07-26 23:34:19 +01:00
Justin Clark-Casey (justincc)
74bc4f61fd
factor out common face parameter checking code
2010-07-26 23:34:19 +01:00
Justin Clark-Casey (justincc)
cfb79cd411
minor: correct a few method names and change accessability
2010-07-26 23:34:19 +01:00
Justin Clark-Casey (justincc)
a5ad792e6c
implement llSetPrimMediaParams()
...
Untested
2010-07-26 23:34:19 +01:00
Justin Clark-Casey (justincc)
8f403cb4b8
Implement llGetPrimMediaParams()
...
Exposes method to get media entry via IMoapModule
As yet untested.
2010-07-26 23:34:19 +01:00
Justin Clark-Casey (justincc)
9682e0c733
Implement media texture persistence over server restarts for sqlite
...
This is currently persisting media as an OSDArray serialized to LLSD XML.
2010-07-26 23:34:19 +01:00
Justin Clark-Casey (justincc)
4ebae14a53
handle ObjectMediaNavigateMessage
...
Other avatars can now see the webpages that you're navigating to.
The requirement for an initial prim click before the texture displayed has gone away.
Flash (e.g. YouTube) appears to work fine.
Still not persisting any media data so this all disappears on server restart
2010-07-26 23:34:18 +01:00
Justin Clark-Casey (justincc)
468450a94d
send a full object update out to avatars when a media texture is initially set
...
this allows other avatars to see it, but still only after they've clicked on the face
still not handling navigation yet
2010-07-26 23:34:18 +01:00
Justin Clark-Casey (justincc)
b1eb83ed6c
start sending media url in object full updates
2010-07-26 23:34:18 +01:00
Justin Clark-Casey (justincc)
4a6adff4cd
start storing a mediaurl on the scene object part
...
not yet persisted or sent in the update
2010-07-26 23:34:18 +01:00
Justin Clark-Casey (justincc)
c290cdd997
replace hand parsing of incoming object media messages with parsing code in libopenmetaverse
2010-07-26 23:34:18 +01:00
Justin Clark-Casey (justincc)
acac47830e
start storing incoming MediaEntry on a new Media field on PrimitiveBaseShape
...
This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost
Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
2010-07-26 23:34:18 +01:00
Justin Clark-Casey (justincc)
9301e36fbc
have a stab at sending the correct number of media entries to shapes
...
actually, this is probably wrong anyway if there's a default texture
it's going to be easier just to gather the object media updates and retain those in-memory now
but what the hell
2010-07-26 23:34:17 +01:00
Justin Clark-Casey (justincc)
701f39c8c2
do a whole load of crappy hacking to get cubes to display google.com
...
currently, for smoe reason the page only appears when you click a face.
also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason
you can still change the url and normal navigation will work again
2010-07-26 23:34:17 +01:00
Justin Clark-Casey (justincc)
2be7d0cdd4
Register ObjectMedia and ObjectMediaNavigate capabilities from moap module.
...
Not sure if these are correct, but just supplying these to the viewer is enough to allow it to put media textures on prims (previously the icons were greyed out).
This is not yet persisted even in-memory, so no other avatars will see it yet.
2010-07-26 23:34:17 +01:00
Justin Clark-Casey (justincc)
ede446cad6
add stub media-on-a-prim (shared media) module
2010-07-26 23:34:17 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
d00466f09a
add mysql support for media on a prim
2010-07-26 23:19:31 +01:00
Justin Clark-Casey (justincc)
f34795c6b3
provide config option for media on a prim
2010-07-26 21:41:39 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie Thielker
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
Melanie Thielker
516ec4acd0
Eat a lockign exception that kills scripts. May bear more investigation
...
in the long run.
2010-07-25 08:11:39 +02:00
Melanie
aa7cadca52
Add some options
2010-07-24 23:36:07 +01:00
Melanie
a9b7774fe0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-24 23:15:38 +01:00
Melanie
4dbff62ef5
Fix some inventory issues
2010-07-24 23:15:06 +01:00
Tom Grimshaw
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
Tom Grimshaw
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
Justin Clark-Casey (justincc)
1a03a0b281
remove compile.bat from a created binary distribution
2010-07-23 23:12:30 +01:00
Justin Clark-Casey (justincc)
2f6fa373ef
in nant distbin, specifically only delete Regions.ini instead of the entire Regions directory
2010-07-23 22:36:03 +01:00
Tom Grimshaw
3057974f31
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-07-22 18:06:16 -07:00
Tom Grimshaw
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
Tom Grimshaw
da5b7e199a
First, change DefaultPermissionsModule so it returns the correct name...
2010-07-22 18:04:55 -07:00
Melanie Thielker
64cc76bd79
Fix up the name of the default permissions module to match it's config name
2010-07-23 01:32:29 +02:00
Melanie Thielker
83aec1ec94
Fix a little infinite recursion i added just for sh.ts and giggles. NOT.
2010-07-22 23:47:10 +02:00
Tom Grimshaw
bf374705c6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-07-22 10:49:14 -07:00
Tom Grimshaw
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
Melanie Thielker
7ebabf185e
change the delay to 0.2s. My bad.
2010-07-22 19:31:02 +02:00
Melanie Thielker
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
Diva Canto
0c0ac65d38
Added ': ' to password prompt. Mantis #4851
2010-07-22 04:00:24 -07:00
Melanie
7b471bb21c
Adding sample configuration to previous patch
2010-07-22 03:04:34 +01:00