aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Clean the loo after use please !!!!!sacha2010-08-071-4/+4
| | | | | | | | | | | | | | | No need to keep useless debug message ! Never heard of wasted cpucycle you darn kid !
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-0723-27778/+27793
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-0723-27778/+27794
| |\ \
| | * \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-063-2/+72
| | |\ \
| | | * | Add new SceneGraphTests class. Add simple TestDuplicateObject()Justin Clark-Casey (justincc)2010-08-073-2/+72
| | | | |
| | * | | Added Check4096 config var under [GridService], at the request of many. ↵Diva Canto2010-08-068-83/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the iteration that Marck had on the Hyperlinker. ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.
| | * | | Allow creation of link regions if there is an existing region within a 4096 ↵Marck2010-08-068-4/+146
| | |/ / | | | | | | | | | | | | | | | | | | | | range. Also add GetHyperlinks() to the grid service.
| | * | Remove old test classes that don't actually test anything not done elsewhereJustin Clark-Casey (justincc)2010-08-073-234/+1
| | | | | | | | | | | | | | | | Also comment out log4net line in InventoryArchiverTests
| | * | minor: a few miscellaneous commentsJustin Clark-Casey (justincc)2010-08-072-0/+9
| | | |
| | * | Fix XStats formatting:BlueWall (James Hughes)2010-08-061-30/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent libomv update broke the json serialization for XStats. This uses String.Format to convert all data to strings with fixed decimal (2 places ), or integer formats as appropriate.
| | * | Relocate one System.Core reference from last commit to the Tests projectjustincc2010-08-061-1/+1
| | | | | | | | | | | | | | | | Ooops, shouldn't have assumed that the tests project came after the main on
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-066-27555/+27568
| | |\ \
| | | * | These files want to be committed -- white space weirdness.Diva Canto2010-08-064-27547/+27547
| | | | |
| | | * | HACK ALERT! There's some underlying bug in the HTTP server that makes ↵Diva Canto2010-08-061-0/+7
| | | | | | | | | | | | | | | | | | | | requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in.
| | * | | Add System.Core references to OpenSim.Region.CoreModules.* to fix windows buildJustin Clark-Casey (justincc)2010-08-061-0/+2
| | | | | | | | | | | | | | | | | | | | This addresses http://opensimulator.org/mantis/view.php?id=4923
| * | | | Correct display of landmark about info. Also correct region maturity ratingMelanie Thielker2010-08-079-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity.
| * | | | Change the (hackish) constant to match the changed enum for attachsMelanie Thielker2010-08-071-2/+2
| | | | |
| * | | | Make the landmark properties work againMelanie Thielker2010-08-071-1/+1
| | |/ / | |/| |
* | | | Correct display of landmark about info. Also correct region maturity ratingMelanie Thielker2010-08-079-13/+36
| | | | | | | | | | | | | | | | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity.
* | | | Change the (hackish) constant to match the changed enum for attachsMelanie Thielker2010-08-071-2/+2
| | | |
* | | | 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.
generated by cgit v1.1 at 2024-12-24 05:37:45 +0000