aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Warp3DMap (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-1/+1
|\ | | | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1
| * More namespace and dll name changes. Still no functional changes.Diva Canto2015-08-301-1/+1
| |
| * Renamed the namespaces tooDiva Canto2015-08-301-1/+1
| |
* | seems to compile ( tests comented out)UbitUmarov2015-09-022-160/+4
| |
* | bad merge?UbitUmarov2015-09-012-7/+179
|\ \ | |/ |/|
| * more fixes on mapUbitUmarov2015-08-231-3/+7
| |
| * fixes on warp3DUbitUmarov2015-08-192-32/+73
| |
| * Merge branch 'master' into careminsterMelanie2013-02-261-12/+8
| |\
| * \ Merge branch 'master' into careminsterMelanie2012-11-131-0/+2
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2012-11-121-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-09-071-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-161-7/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-06-062-217/+251
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | | | | | | Cache the last maptile and return the cachrd tile if the last request isMelanie2012-03-291-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | less than an hour ago. Avoids generating the maptile twice on startup.
* | | | | | | | Warp3DImageModule. Reduce workload by not calling to render the root prim ↵AliciaRaven2015-06-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | twice. When loading prims to draw the map, the Warp3D system first calls to load the root prim, followed by all the prims in the SOG. The initial call to load the root prim is not required because it is also in the parts list. The result of this was that all root prims were being loaded twice. Signed-off-by: Diva Canto <diva@metaverseink.com>
* | | | | | | | Eliminated many warningsOren Hurvitz2014-04-231-0/+3
| | | | | | | |
* | | | | | | | Maybe slightly reduce warp3d memory leakage by disposing of decoded bitmap ↵Justin Clark-Casey (justincc)2014-02-281-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in Warp3DImageModule.GetTexture() However, this still appears to be leaking massively, at least for me. Possible cause is warp3D using GDI objects internally and not disposing of them.
* | | | | | | | If texture decode fails in Warp3D map maker, log uuid of asset that failed ↵Justin Clark-Casey (justincc)2014-02-201-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to decode along with exception
* | | | | | | | varregion: remove debugging splat file saving that fills up theRobert Adams2014-01-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maptile dir and causes errors.
* | | | | | | | varregion: Update Warp3D to properly handle varregions.Robert Adams2014-01-192-260/+417
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes additions to Warp3D: Optional rendering of mesh and scupltie prims (INI parameter. Off by default) Texturing of large prims (INI parameter. On by default) Better garbage collection
* | | | | | | | varregion: many more updates removing the constant RegionSize and replacingRobert Adams2013-12-261-1/+3
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | with a passed region size. This time in the map code and grid services code.
* | | | | | | Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-251-12/+8
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
* | | | | | Another 10 modules' directives moved from .addin.xmlDiva Canto2012-11-121-0/+2
| |_|_|_|/ |/| | | |
* | | | | Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-121-1/+1
| |_|_|/ |/| | | | | | | | | | | grepping for remaining uses
* | | | 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.
* | | | 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
* | | When generating a Warp3D texture, set the detailTexture[i] variable on ↵Justin Clark-Casey (justincc)2012-07-141-7/+14
| |/ |/| | | | | | | | | | | | | resize from the JPEG2000 original rather than only saving it to disk. This appears to be the cause of the warp 3d exception seen when starting a new region for the first time. Subsequent starts were okay because resized saved bitmap was correctly retrieved from disk. Should fix http://opensimulator.org/mantis/view.php?id=5204 and http://opensimulator.org/mantis/view.php?id=5272
* | minor: Change log messages on Warp3DImageModule to show they are from this ↵Justin Clark-Casey (justincc)2012-06-061-7/+9
| | | | | | | | module
* | Rename MapImageModule for Warp3D to Warp3DImageModule to match its class ↵Justin Clark-Casey (justincc)2012-06-061-0/+0
| | | | | | | | name and make it easier to distinguish between map image modules.
* | Actively dispose of Bitmaps in Warp3D image module and world map module once ↵Justin Clark-Casey (justincc)2012-06-062-212/+244
| | | | | | | | | | | | we've finished with them. This might help with memory leakage issues though I suspect it won't.
* | Changed the Map-related messages from Info to Debug. They're debug messages.Diva Canto2012-04-231-2/+2
|/
* match water color for warp3d map tiler and adjust lightingMichael Cerquoni aka Nebadon Izumi2011-06-131-5/+7
|
* remove some mono compiler warningsJustin Clark-Casey (justincc)2011-01-211-3/+1
|
* * AbsolutePosition.Get{} returns incorrect result for child prim so switch ↵Teravus Ovares (Dan Olivares)2010-10-301-1/+1
| | | | to using prim.GetWorldPosition() in the warp renderer.
* Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-061-9/+11
| | | | functional
* Convert the map image modules to new style modulesMelanie2010-10-061-6/+20
|
* Revert an accidental default value changeMelanie2010-10-051-1/+1
|
* Patch to allow other cam angles. Not complete. Thanks, Antont.Melanie2010-10-051-4/+14
|
* Avoid throwing errors when adding existing meshes to the render sceneLatif Khalifa2010-10-041-0/+6
|
* Adapt to core changesMelanie2010-10-031-1/+1
|
* Addign the new / renamed files for previous commitMelanie2010-10-034-0/+1405
generated by cgit v1.1 at 2024-08-23 11:53:15 +0000