Commit Graph

15190 Commits (b16f4024dbf89e2a9a30232fe0be452c0e722b90)

Author SHA1 Message Date
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 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
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
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
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
Melanie 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
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
Melanie Thielker fb89d0ff4e Allow megaregions to be used in M7, should we so decide 2010-07-21 12:32:23 +02:00
Melanie Thielker 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
Melanie f63a4c8f2f Merge branch 'master' into careminster-presence-refactor 2010-07-21 12:03:44 +01:00
Melanie Thielker c72c84b455 Refine autoreturn a bit 2010-07-21 12:16:17 +02:00
Melanie ac1a34714d Allow Megaregions to start properly after an unclean shutdown 2010-07-20 23:24:04 +01:00
Diva Canto f08afc4f87 Restore lines that have been removed due to previous merge conflict. 2010-07-20 14:28:17 -07:00
Melanie 4ccc141764 Resync with master 2010-07-20 21:49:31 +01:00
Melanie c0b8cbd85b Merge branch 'master' into careminster-presence-refactor 2010-07-20 21:47:53 +01:00
Melanie dcf7973c9b Merge branch 'master' into careminster-presence-refactor 2010-07-20 21:39:20 +01:00
Melanie 176cb01130 Remove a merge artefact 2010-07-20 21:38:31 +01:00