aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Moved the small HGUuidGatherer class to the file where its parent class is. ↵Diva Canto2012-09-212-74/+2
| | | | No need to keep 2 separate files.
* Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already ↵Diva Canto2012-09-211-18/+24
| | | | downloads the assets, so we don't need to do it again...
* Minor: may avoid crashes of sims that still don't have this configuration ↵Diva Canto2012-09-211-1/+1
| | | | section.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-211-2/+2
|\
| * Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't ↵Justin Clark-Casey (justincc)2012-09-211-2/+2
| | | | | | | | been instantiated with an assetServerURL then call down to overriden UuidGatherer.GetAsset() instead of calling m_assetService.GetAsset() itself - these two codepaths are now identical.
* | HG 2.0: added asset import/export policies at the sim too.Diva Canto2012-09-211-8/+15
| |
* | Minor: change the return value of unsuccessful posts to string.Empty.Diva Canto2012-09-211-1/+1
|/
* More HG2.0: Added permission policies in HGAsset Service based on asset ↵Diva Canto2012-09-201-15/+19
| | | | types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
* Correctly override and call base OpenSimTestCase.SetUp() method in ↵Justin Clark-Casey (justincc)2012-09-193-6/+11
| | | | | | GridConnectorsTests and ArchiverTests. Remove unrelated compile warning from AttachmentsModuleTests.
* Moving ScriptModuleComms into the CoreModules tree.Mic Bowman2012-09-171-0/+367
|
* HG2.0: Generalized the allowed HG appearances to be more than 1.Diva Canto2012-09-161-31/+59
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-1512-760/+1826
|\
| * Add basic asset connector tests to check behaviour for normal, local and ↵Justin Clark-Casey (justincc)2012-09-152-2/+141
| | | | | | | | | | | | | | temporary assets. Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
| * For FlotsamAssetCache, always update access times of cached scene assets ↵Justin Clark-Casey (justincc)2012-09-151-20/+17
| | | | | | | | | | | | | | | | before looking for files to expire. This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed. The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced. This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem. This previously had a default of true.
| * Added unit tests for multi-region OARsOren Hurvitz2012-09-141-58/+326
| |
| * Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the ↵Justin Clark-Casey (justincc)2012-09-143-9/+9
| | | | | | | | | | | | | | multi-OAR patch there is now only one class that handles this operation. Adapation of 0004-Renamed-ArchiveWriteRequestPreparation-to-ArchiveWri.patch in http://opensimulator.org/mantis/view.php?id=6105 since that did not directly apply
| * Support multi-region OAR filesOren Hurvitz2012-09-148-395/+1057
| | | | | | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
* | More on HG2.0: added the possibility of controlling the appearance that ↵Diva Canto2012-09-152-2/+171
|/ | | | avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-131-1/+1
|\
| * correcting a typo that causes c# express to complain about xml comment ↵SignpostMarv2012-09-131-1/+1
| | | | | | | | | | | | containing invalid xml Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Restarting to work on HGSuitcaseInventoryService: added the ability for the ↵Diva Canto2012-09-131-0/+2
|/ | | | outside world to retrieve appearance items. Not ACLed yet.
* minor: Comment out friends notification log spam for now.Justin Clark-Casey (justincc)2012-09-121-3/+3
|
* Adjust namespce of FlotsamCacheBlueWall2012-09-092-2/+1
| | | | Place FloatsamCache in the same namespace as our other core asset caches
* Revert "Move addin information to CoreModulePlugin.addin.xml"BlueWall2012-09-093-3/+6
| | | | | | This reverts commit 2ec34580ce3807cede97539488237040e1a8a6cc. Moving the attributes for mono addins back to the source file - this also fixes http://opensimulator.org/mantis/view.php?id=6278.
* Move addin information to CoreModulePlugin.addin.xmlBlueWall2012-09-073-6/+3
| | | | Move the addin information from attributes in the source file to the CoreModulePlugin.xml, which is the standard. This will help us automate addin version dependency information when we make new OpenSim releases.
* Add warning chevrons around the GC.Collect added to Warp3DImageModule in ↵Justin Clark-Casey (justincc)2012-09-071-0/+4
| | | | | | | | commit 5eb2526 Manually calling GC.Collect() really shouldnt' be necessary and is generally regarded as a bad idea. A GC should occur anyway pretty shortly afterwards. However, can leave this in development code for now to see if it does actually make a significant difference rather than simply doing a GC a little earlier.
* Add missing DynamicTexture.cs file from last commitJustin Clark-Casey (justincc)2012-09-061-0/+61
|
* If reusing dynamic textures, do not reuse small data length textures that ↵Justin Clark-Casey (justincc)2012-09-066-43/+127
| | | | | | | | | fall below current viewer discard level 2 thresholds. Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache. This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request. This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-09-062-3/+33
|\
| * If the GetTexture capability receives a request for a range of data beyond ↵Justin Clark-Casey (justincc)2012-09-062-3/+33
| | | | | | | | | | | | | | | | | | | | that of an otherwise valid asset, return HTTP PartialContent rather than RequestedRangeNotSatisfiable. This is because recent viewers (3.2.1, 3.3.4) and probably earlier ones using the http GetTexture capability will sometimes make such invalid range requests. This appears to happen if the viewer's estimate of texture sizes at discard levels > 0 (chiefly 2) exceeds the total texture size. I believe this does not normally happen but can occur for dynamic textures with are large but mainly blank. If this happens, returning a RequestedRangeNotSatisfiable will cause the viewer to not render the texture at the final resolution. However, returning a PartialContent (or OK) even with 0 data will allow the viewer to render the final texture.
* | 0006270: Warp3D leaks memory on mono based systemsBlueWall2012-09-061-1/+4
|/ | | | Thanks Hiro Lecker for a patch to reduce memory useage with Warp3D map module
* Make ReuseDynamicTextures an experimental config setting in [Textures]. ↵Justin Clark-Casey (justincc)2012-08-301-1/+4
| | | | | | | | | | Default is false, as before. If true, this setting reuses dynamically generated textures (i.e. created through osSetDynamicTextureData() and similar OSSL functions) where possible rather than always regenerating them. This results in much quicker updates viewer-side but may bloat the asset cache (though this is fixable). Also, sometimes issue have been seen where dynamic textures do not transfer to the viewer properly (permanently blurry). If this happens and that flag is set then they are not regenerated, the viewer has to clear cache or wait for 24 hours before all cached uuids are invalidated. CUrrently experimental. Default is false, as before.
* If the compile-time DynamicTextureModule.ReuseTextures flag is set, check ↵Justin Clark-Casey (justincc)2012-08-301-43/+59
| | | | metadata still exists for any reused asset in case some other process has removed it from the cache.
* This partially implements the LSL function to set the responseMic Bowman2012-08-291-1/+19
| | | | | | | | type for an HTTP request. Since the "official" LSL function limits the use of the response type, it is implemented as osSetContentType with a string for the content mime type and a threat level of high. With this function you should be able to implement rather functional media-on-a-prim application with much less difficulty.
* Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where ↵Justin Clark-Casey (justincc)2012-08-291-32/+32
| | | | | | | | | | | folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders. This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder. Added regression test for this case. Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs. However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch.
* Add experimental DynamicTextureModule.ReuseTextures flag, currently only ↵Justin Clark-Casey (justincc)2012-08-284-55/+297
| | | | | | | | | | | configurable on compile. Disabled (status quo) by default. This flag makes the dynamic texture module reuse cache previously dynamically generated textures given the same input commands and extra params for 24 hours. This occurs as long as those commands would always generate the same texture (e.g. they do not contain commands to fetch data from the web). This makes texture changing faster as a viewer-cached texture uuid is sent and may reduce simulator load in regions with generation of lots of dynamic textures. A downside is that this stops expiry of old temporary dynamic textures from the cache, Another downside is that a jpeg2000 generation that partially failed is currently not regenerated until restart or after 24 hours.
* Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). ↵Justin Clark-Casey (justincc)2012-08-282-6/+7
| | | | Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method.
* formattingSignpostMarv2012-08-271-22/+22
|
* refactoring to load from self (fixes ChanneDigger being absent)SignpostMarv2012-08-271-5/+11
|
* refactoring to assign the first argument to a variableSignpostMarv2012-08-271-4/+5
|
* minor: Simplify return of vector render module name and some very minor ↵Justin Clark-Casey (justincc)2012-08-271-4/+3
| | | | removal of unncessary syntax clutter
* Add VectorRenderModule.TestRepeatSameDrawDifferentExtraParams()Justin Clark-Casey (justincc)2012-08-271-2/+32
|
* Add VectorRenderModuleTests.TestRepeatDrawContainingImage()Justin Clark-Casey (justincc)2012-08-271-0/+31
|
* Add VectorRenderModuleTests.TestRepeatDraw()Justin Clark-Casey (justincc)2012-08-271-11/+48
|
* Lock disposal of separate gdi+ objects under different threads since this ↵Justin Clark-Casey (justincc)2012-08-221-26/+42
| | | | | | | | | | prevents malloc heap corruption seen under Ubuntu 10.04.1 and 11.04 - probably a libcairo issue In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously, the native malloc heap can become corrupted, possibly due to a double free(). This may be due to bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX. These problems were seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1. They go away if disposal is perfomed under lock.
* Fix bug in SoundModule.PlayAttachedSound() where every sound update to an ↵Justin Clark-Casey (justincc)2012-08-211-3/+5
| | | | | | avatar would base its gain calculation on the previous avatar's gain, instead of the original input gain This is similar to commit d89faa which fixed the same kind of bug in TriggerSound()
* When loading an OAR, validate any group UUIDs and properly reconstruct ↵Justin Clark-Casey (justincc)2012-08-201-1/+62
| | | | | | | | | | parcel access lists. If a group UUID is present that is not on this simulator then the object or parcel is no longer group owned. This is a change from previous behaviour where such invalid UUIDs were kept. This is an adaptation of patch 0002 from http://opensimulator.org/mantis/view.php?id=6105 by Oren Hurvitz of Kitely. My adaptations are formatting only, apart from the notices about parcel owner IDs not being saved since this has now been fixed. Thanks Oren.
* Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-203-3/+3
| | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
* Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
|
* As per lindn spec, disable detach and drop for temp attachmentsMelanie2012-08-141-0/+8
|