aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-08-0752-24486/+29253
|\ | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Merge branch 'careminster-presence-refactor' of ↵Tom2010-08-0643-24483/+29188
| |\ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| | * Merge branch 'master' into careminster-presence-refactorMelanie2010-08-0643-24483/+29188
| | |\
| | | * Fix a parenthesis in prior commitMelanie2010-08-061-1/+1
| | | |
| | | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-0632-24337/+28949
| | | |\
| | | | * Merge branch 'moap'Justin Clark-Casey (justincc)2010-08-0632-24337/+28949
| | | | |\
| | | | | * fix mysql/mssql prim serialization problemJustin Clark-Casey (justincc)2010-08-042-12/+4
| | | | | |
| | | | | * Implement MediaUrl persistence for MySQL and MsSQLJustin Clark-Casey (justincc)2010-08-032-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | Not sure how I forgot this. This may resolve problems with media textures not persisting over restart for these databases.
| | | | | * Simplify serialized version string. Change element capitalization for ↵Justin Clark-Casey (justincc)2010-08-032-36/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistency THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database. This commit also improves locking for manipulation of media entries.
| | | | | * get rid of PrimitiveBaseShape.MediaRaw staging postJustin Clark-Casey (justincc)2010-08-035-49/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
| | | | | * remove duplicated serialization codeJustin Clark-Casey (justincc)2010-08-032-67/+29
| | | | | |
| | | | | * serialize media textures to inventory with a largely osd representation ↵Justin Clark-Casey (justincc)2010-08-032-7/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than .net auto-serialization THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases. This makes media textures serialized in the same way, which is probably better in the long term.
| | | | | * add userExposed parameter to part copy eventJustin Clark-Casey (justincc)2010-07-284-5/+14
| | | | | |
| | | | | * relocate moap specific cloning code to MoapModuleJustin Clark-Casey (justincc)2010-07-283-15/+49
| | | | | |
| | | | | * Fix problem where changes to media textures for prims duplicated by shify ↵Justin Clark-Casey (justincc)2010-07-283-16/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | copy would change both prims until server restart I also found out that you can crash the current viewer by giving it more media entrys than it's expecting
| | | | | * comment out further debug line in BaseHttpServerJustin Clark-Casey (justincc)2010-07-271-1/+1
| | | | | |
| | | | | * comment out verbose debug loggingJustin Clark-Casey (justincc)2010-07-271-34/+36
| | | | | |
| | | | | * Update OpenMetaverse libraries to r3287 + r3294 (removal of ↵Justin Clark-Casey (justincc)2010-07-279-24305/+27547
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenMetaverse.Http.dll dependency) + r3378 (treat MediaPermission as a bitfield) As far as I can determine, r3287 + r3294 patch was the previous update to the OpenMetaverse libraries This change just adds r3378 to overcome problems storing media textures with certain permission combinations in inventory This is a limited change in order to isolate moap from any other possible libomv update issues An update to the forthcoming libomv 0.8.3 is expected in due course to replace this This commit also deletes OpenMetaverse.Utilities.* as it's unused (on the advice of jhurliman).
| | | | | * make MoapModule ignore possible future media texture data that it can't handleJustin Clark-Casey (justincc)2010-07-271-2/+4
| | | | | |
| | | | | * Make MoapModule ignore non-sl media texture dataJustin Clark-Casey (justincc)2010-07-271-2/+10
| | | | | |
| | | | | * Merge branch 'moap' of ssh://opensimulator.org/var/git/opensim into moapJustin Clark-Casey (justincc)2010-07-260-0/+0
| | | | | |\
| | | | | | * add mssql support for media on a primJustin Clark-Casey (justincc)2010-07-262-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | compiles but not tested. please test and correct if necessary!
| | | | | | * add mysql support for media on a primJustin Clark-Casey (justincc)2010-07-262-3/+14
| | | | | | |
| | | | | | * provide config option for media on a primJustin Clark-Casey (justincc)2010-07-263-4/+26
| | | | | | |
| | | | | | * relocate serialization code from SQLiteRegionData to MoapModule using load ↵Justin Clark-Casey (justincc)2010-07-263-55/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | | * Add EventManager.OnSceneObjectPreSave() for future use. This is triggered ↵Justin Clark-Casey (justincc)2010-07-263-5/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | immediately before a copy of the group is persisted to storage
| | | | | | * Add EventManager.OnSceneObjectLoaded() for future use. This is fired ↵Justin Clark-Casey (justincc)2010-07-263-9/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | immediately after a scene object is loaded from storage.
| | | | | | * Put a wrapper around the media texture region serializationJustin Clark-Casey (justincc)2010-07-261-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | | * also add avatar id to an updated media url - not just new onesJustin Clark-Casey (justincc)2010-07-211-1/+1
| | | | | | |
| | | | | | * Properly set TextureEntry.MediaFlags when a media texture is setJustin Clark-Casey (justincc)2010-07-211-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.
| | | | | | * start adding user ids to the media urlsJustin Clark-Casey (justincc)2010-07-211-12/+16
| | | | | | |
| | | | | | * add missing regionstore migration file for new fields. D'oh!Justin Clark-Casey (justincc)2010-07-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this should enable persistence now
| | | | | | * Handle checking of line starting "*" wildcard for whitelist patternsJustin Clark-Casey (justincc)2010-07-151-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A line starting * can only be applied to the domain, not the path
| | | | | | * refactor: simplify current whitelist url checking by using System.UriJustin Clark-Casey (justincc)2010-07-151-7/+8
| | | | | | |
| | | | | | * Implement * end wildcard for whitelist urlsJustin Clark-Casey (justincc)2010-07-151-1/+5
| | | | | | |
| | | | | | * properly expose prim media LSL functions to scriptsJustin Clark-Casey (justincc)2010-07-153-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
| | | | | | * fix bug where prim persistence would fail if media had never been setJustin Clark-Casey (justincc)2010-07-141-6/+9
| | | | | | |
| | | | | | * fix previous media interact serverside checking. perform very basic ↵Justin Clark-Casey (justincc)2010-07-142-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
| | | | | | * implement code to deregister users on DeregisterCapsJustin Clark-Casey (justincc)2010-07-141-3/+34
| | | | | | |
| | | | | | * implement serverside checks for media texture navigation in order to stop ↵Justin Clark-Casey (justincc)2010-07-133-8/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | naughty clients
| | | | | | * factor out soon to be common media permissions check codeJustin Clark-Casey (justincc)2010-07-131-4/+9
| | | | | | |
| | | | | | * implement prim media control permissions serverside in order to stop bad clientsJustin Clark-Casey (justincc)2010-07-133-24/+127
| | | | | | |
| | | | | | * discard an object media update message if it tries to set more media ↵Justin Clark-Casey (justincc)2010-07-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | textures than the prim has faces
| | | | | | * Fire CHANGED_MEDIA event if a media texture is set or clearedJustin Clark-Casey (justincc)2010-07-123-1/+8
| | | | | | |
| | | | | | * implement llClearPrimMedia()Justin Clark-Casey (justincc)2010-07-123-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | untested
| | | | | | * fix issue with GetMediaEntry if the face requested wasn't set to a media textureJustin Clark-Casey (justincc)2010-07-121-1/+2
| | | | | | |
| | | | | | * fix problem persisting when only one face had a media textureJustin Clark-Casey (justincc)2010-07-122-2/+15
| | | | | | |
| | | | | | * factor out common code for updating the media urlJustin Clark-Casey (justincc)2010-07-121-41/+27
| | | | | | |
| | | | | | * factor out common face parameter checking codeJustin Clark-Casey (justincc)2010-07-121-35/+21
| | | | | | |
| | | | | | * minor: correct a few method names and change accessabilityJustin Clark-Casey (justincc)2010-07-121-3/+3
| | | | | | |
generated by cgit v1.1 at 2024-12-16 08:28:08 +0000