aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (unfollow)
Commit message (Collapse)AuthorFilesLines
2010-07-26provide config option for media on a primJustin Clark-Casey (justincc)2-4/+21
2010-07-26relocate serialization code from SQLiteRegionData to MoapModule using load ↵Justin Clark-Casey (justincc)1-2/+68
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-26Add EventManager.OnSceneObjectPreSave() for future use. This is triggered ↵Justin Clark-Casey (justincc)3-5/+46
immediately before a copy of the group is persisted to storage
2010-07-26Add EventManager.OnSceneObjectLoaded() for future use. This is fired ↵Justin Clark-Casey (justincc)3-9/+46
immediately after a scene object is loaded from storage.
2010-07-26also add avatar id to an updated media url - not just new onesJustin Clark-Casey (justincc)1-1/+1
2010-07-26Properly set TextureEntry.MediaFlags when a media texture is setJustin Clark-Casey (justincc)1-3/+43
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-26start adding user ids to the media urlsJustin Clark-Casey (justincc)1-12/+16
2010-07-26Handle checking of line starting "*" wildcard for whitelist patternsJustin Clark-Casey (justincc)1-8/+22
A line starting * can only be applied to the domain, not the path
2010-07-26refactor: simplify current whitelist url checking by using System.UriJustin Clark-Casey (justincc)1-7/+8
2010-07-26Implement * end wildcard for whitelist urlsJustin Clark-Casey (justincc)1-1/+5
2010-07-26properly expose prim media LSL functions to scriptsJustin Clark-Casey (justincc)3-1/+19
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-26fix previous media interact serverside checking. perform very basic ↵Justin Clark-Casey (justincc)2-10/+91
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-26implement code to deregister users on DeregisterCapsJustin Clark-Casey (justincc)1-3/+34
2010-07-26implement serverside checks for media texture navigation in order to stop ↵Justin Clark-Casey (justincc)3-8/+52
naughty clients
2010-07-26factor out soon to be common media permissions check codeJustin Clark-Casey (justincc)1-4/+9
2010-07-26implement prim media control permissions serverside in order to stop bad clientsJustin Clark-Casey (justincc)3-24/+127
2010-07-26discard an object media update message if it tries to set more media ↵Justin Clark-Casey (justincc)1-0/+8
textures than the prim has faces
2010-07-26Fire CHANGED_MEDIA event if a media texture is set or clearedJustin Clark-Casey (justincc)3-1/+8
2010-07-26implement llClearPrimMedia()Justin Clark-Casey (justincc)3-0/+35
untested
2010-07-26fix issue with GetMediaEntry if the face requested wasn't set to a media textureJustin Clark-Casey (justincc)1-1/+2
2010-07-26fix problem persisting when only one face had a media textureJustin Clark-Casey (justincc)1-0/+7
2010-07-26factor out common code for updating the media urlJustin Clark-Casey (justincc)1-41/+27
2010-07-26factor out common face parameter checking codeJustin Clark-Casey (justincc)1-35/+21
2010-07-26minor: correct a few method names and change accessabilityJustin Clark-Casey (justincc)1-3/+3
2010-07-26implement llSetPrimMediaParams()Justin Clark-Casey (justincc)5-13/+183
Untested
2010-07-26Implement llGetPrimMediaParams()Justin Clark-Casey (justincc)4-2/+193
Exposes method to get media entry via IMoapModule As yet untested.
2010-07-26Implement media texture persistence over server restarts for sqliteJustin Clark-Casey (justincc)1-1/+21
This is currently persisting media as an OSDArray serialized to LLSD XML.
2010-07-26handle ObjectMediaNavigateMessageJustin Clark-Casey (justincc)1-14/+55
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-26send a full object update out to avatars when a media texture is initially setJustin Clark-Casey (justincc)1-6/+2
this allows other avatars to see it, but still only after they've clicked on the face still not handling navigation yet
2010-07-26start sending media url in object full updatesJustin Clark-Casey (justincc)1-2/+1
2010-07-26start storing a mediaurl on the scene object partJustin Clark-Casey (justincc)2-7/+30
not yet persisted or sent in the update
2010-07-26replace hand parsing of incoming object media messages with parsing code in ↵Justin Clark-Casey (justincc)1-60/+31
libopenmetaverse
2010-07-26start storing incoming MediaEntry on a new Media field on PrimitiveBaseShapeJustin Clark-Casey (justincc)1-3/+60
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-26have a stab at sending the correct number of media entries to shapesJustin Clark-Casey (justincc)1-2/+14
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-26do a whole load of crappy hacking to get cubes to display google.comJustin Clark-Casey (justincc)1-6/+89
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-26Register ObjectMedia and ObjectMediaNavigate capabilities from moap module.Justin Clark-Casey (justincc)1-5/+53
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-26add stub media-on-a-prim (shared media) moduleJustin Clark-Casey (justincc)1-0/+56
2010-07-20Allow Megaregions to start properly after an unclean shutdownMelanie2-1/+4
2010-07-20Restore lines that have been removed due to previous merge conflict.Diva Canto1-2/+6
2010-07-20Remove a merge artefactMelanie1-4/+0
2010-07-20When a god uses mass permission setting, the V bit is cleared from nextMelanie Thielker1-4/+7
perms, rendering the item unmoveable for the next owenr. Make god mods conform to the rules, too.
2010-07-20prevent hacked viewers from being able to delete arbitrary items from anyMelanie Thielker1-3/+18
prim. Allow friends with perms and shared group members to move or copy things out of prims
2010-07-20Fix a few permissions vulnerability. Owners could cause permissionsMelanie Thielker3-8/+40
escalation on items contained in prims using a hacked viewer
2010-07-20adjust DialogModule to only send broadcast alerts to root agentsJustin Clark-Casey (justincc)1-2/+3
2010-07-20Relaxed the ultra-conservative lock on m_items. Needs testing under linux ↵Diva Canto1-219/+188
and stress.
2010-07-20Adding it again.Diva Canto1-28/+36
Revert "Reverting this for now, but this needs to go in again." This reverts commit c0d9ab941dd1ab88f00f6d4f2a53a4fe5c605e57.
2010-07-19Reverting this for now, but this needs to go in again.Diva Canto1-36/+28
Revert "Another stab at http://opensimulator.org/mantis/view.php?id=4858. Eliminated more nested locks." This reverts commit ffbae52a130376ecaa04d7d475709985c62c06ed.
2010-07-19Another stab at http://opensimulator.org/mantis/view.php?id=4858. Eliminated ↵Diva Canto1-28/+36
more nested locks.
2010-07-19One more stab at http://opensimulator.org/mantis/view.php?id=4858.Diva Canto1-33/+33
Eliminated the nested locks of m_Scripts and m_PrimObjects.
2010-07-19Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests ↵Diva Canto1-1/+0
indicate that this is what causes deadlock. More tests needed.