Commit Graph

12619 Commits (09231b1d123263a04804977904429d975647b22e)

Author SHA1 Message Date
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
Justin Clark-Casey (justincc) 8e8076c947 also add avatar id to an updated media url - not just new ones 2010-07-21 19:32:05 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 8e67f6dc44 start adding user ids to the media urls 2010-07-21 14:25:21 +01:00
Justin Clark-Casey (justincc) 2c3207df07 add missing regionstore migration file for new fields. D'oh!
this should enable persistence now
2010-07-15 23:28:36 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 2ec6e3b440 refactor: simplify current whitelist url checking by using System.Uri 2010-07-15 21:40:44 +01:00
Justin Clark-Casey (justincc) 610a2626a5 Implement * end wildcard for whitelist urls 2010-07-15 21:14:55 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) aec3b33011 fix bug where prim persistence would fail if media had never been set 2010-07-14 23:48:24 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) e44e1ccbd3 implement code to deregister users on DeregisterCaps 2010-07-14 00:16:37 +01:00
Justin Clark-Casey (justincc) a4c6c4de91 implement serverside checks for media texture navigation in order to stop naughty clients 2010-07-13 23:58:19 +01:00
Justin Clark-Casey (justincc) 2ad9789b1c factor out soon to be common media permissions check code 2010-07-13 23:46:49 +01:00
Justin Clark-Casey (justincc) 6f644f5322 implement prim media control permissions serverside in order to stop bad clients 2010-07-13 23:19:45 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 55caab1efd Fire CHANGED_MEDIA event if a media texture is set or cleared 2010-07-12 22:27:11 +01:00
Justin Clark-Casey (justincc) 4b0c5711b5 implement llClearPrimMedia()
untested
2010-07-12 22:00:45 +01:00
Justin Clark-Casey (justincc) 01ff3c9f9f fix issue with GetMediaEntry if the face requested wasn't set to a media texture 2010-07-12 21:43:36 +01:00
Justin Clark-Casey (justincc) d4684da8bd fix problem persisting when only one face had a media texture 2010-07-12 21:33:27 +01:00
Justin Clark-Casey (justincc) 7691a638e3 factor out common code for updating the media url 2010-07-12 20:18:10 +01:00
Justin Clark-Casey (justincc) 9231fc0f31 factor out common face parameter checking code 2010-07-12 20:15:10 +01:00
Justin Clark-Casey (justincc) 312eb5e42e minor: correct a few method names and change accessability 2010-07-12 19:48:20 +01:00
Justin Clark-Casey (justincc) 4a92046b58 implement llSetPrimMediaParams()
Untested
2010-07-12 19:46:23 +01:00
Justin Clark-Casey (justincc) 7e3c54213c Implement llGetPrimMediaParams()
Exposes method to get media entry via IMoapModule
As yet untested.
2010-07-12 15:49:09 +01:00
Justin Clark-Casey (justincc) 53ddcf6d25 Implement media texture persistence over server restarts for sqlite
This is currently persisting media as an OSDArray serialized to LLSD XML.
2010-07-01 22:52:31 +01:00
Justin Clark-Casey (justincc) ca5d1411a6 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-01 20:25:35 +01:00
Justin Clark-Casey (justincc) 4fb7c1a9e1 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-01 19:53:03 +01:00
Justin Clark-Casey (justincc) 81f727416d start sending media url in object full updates 2010-07-01 19:33:41 +01:00
Justin Clark-Casey (justincc) 18b22e26cb start storing a mediaurl on the scene object part
not yet persisted or sent in the update
2010-07-01 19:25:46 +01:00
Justin Clark-Casey (justincc) de769d56f5 replace hand parsing of incoming object media messages with parsing code in libopenmetaverse 2010-07-01 18:42:47 +01:00
Justin Clark-Casey (justincc) 214db91503 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-01 02:06:51 +01:00
Justin Clark-Casey (justincc) 9250268753 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-01 00:47:12 +01:00
Justin Clark-Casey (justincc) 94646599f0 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-01 00:24:30 +01:00
Justin Clark-Casey (justincc) e098d33929 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-06-30 22:30:05 +01:00
Justin Clark-Casey (justincc) 1077a8a392 add stub media-on-a-prim (shared media) module 2010-06-30 20:46:35 +01:00
Justin Clark-Casey (justincc) eb30b60e52 minor: comment out high volume texture serving module debug message 2010-06-30 19:54:35 +01:00
Diva Canto b6264e60d3 Removed opportunity for exception in BaseHttpServer. (mantis #4825) 2010-06-30 06:35:22 -07:00
Justin Clark-Casey (justincc) be0af01061 Revert "stop exceptions in setting and getting state from propogating since they aren't fatal to operations"
This reverts commit 94cb6fc916.
2010-06-29 23:43:38 +01:00
Melanie 714367efb9 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-29 21:51:56 +01:00
Diva Canto d06b977ed1 Remove the override from DeletToInventory in HGInventoryAccessModule. This may be causing the infinite loop, not sure. 2010-06-29 14:21:48 -07:00
Melanie 6701fc2ffa 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-06-29 21:50:52 +01:00
Melanie 5d11833ae1 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-29 20:36:36 +01:00
Justin Clark-Casey (justincc) 94cb6fc916 stop exceptions in setting and getting state from propogating since they aren't fatal to operations
this will hopefully stop "save oar" from failing if a script asset is corrupt
2010-06-29 21:08:09 +01:00