ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-13 19:14:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,513 Commits 5 Branches 86 Tags
030c866b34e80daa685bda4b571a0e7d39a70ffc
Commit Graph

29 Commits

Author SHA1 Message Date
UbitUmarov
24a093035b more fixes on map 2015-08-23 01:42:51 +01:00
UbitUmarov
2e15ed80cd fixes on warp3D 2015-08-19 12:08:45 +01:00
Melanie
54ee95dd8e Merge branch 'master' into careminster 2013-02-26 13:34:20 +00:00
Justin Clark-Casey (justincc)
d0cb4fc326 Move map related settings from [Startup] to a new [Map] section in OpenSim.ini 
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.
 2013-02-25 23:04:38 +00:00
Melanie
af01a2320a Merge branch 'master' into careminster 2012-11-13 10:49:24 +00:00
Diva Canto
31177d9259 Another 10 modules' directives moved from .addin.xml 2012-11-12 21:14:58 -08:00
Melanie
2e0ce70e63 Merge branch 'master' into careminster 
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
 2012-11-12 23:27:47 +00:00
Melanie
0d15a6a01f Remove any mention of IRegionModule from region names and comments to aid 
grepping for remaining uses
 2012-11-12 19:18:20 +00:00
Melanie
924df14c5e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/VersionInfo.cs
 2012-09-07 19:49:46 +01:00
Justin Clark-Casey (justincc)
288baaecaf Add warning chevrons around the GC.Collect added to Warp3DImageModule in 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.
 2012-09-07 00:46:24 +01:00
BlueWall
5eb2526e88 0006270: Warp3D leaks memory on mono based systems 
Thanks Hiro Lecker for a patch to reduce memory useage with Warp3D map module
 2012-09-06 05:18:08 -04:00
Melanie
7b9c4d2826 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-16 21:32:10 +01:00
Justin Clark-Casey (justincc)
ec6a195e40 When generating a Warp3D texture, set the detailTexture[i] variable on 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
 2012-07-14 01:11:30 +01:00
Melanie
e733fb32cf Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
 2012-06-06 13:07:05 +01:00
Justin Clark-Casey (justincc)
514dd85199 minor: Change log messages on Warp3DImageModule to show they are from this module 2012-06-06 04:18:38 +01:00
Justin Clark-Casey (justincc)
53c25a4778 Rename MapImageModule for Warp3D to Warp3DImageModule to match its class name and make it easier to distinguish between map image modules. 2012-06-06 04:15:00 +01:00
Justin Clark-Casey (justincc)
2b0de66216 Actively dispose of Bitmaps in Warp3D image module and world map module once we've finished with them. 
This might help with memory leakage issues though I suspect it won't.
 2012-06-06 04:11:16 +01:00
Diva Canto
fd27988978 Changed the Map-related messages from Info to Debug. They're debug messages. 2012-04-23 21:29:18 -07:00
Melanie
5e3999c84c Cache the last maptile and return the cachrd tile if the last request is 
less than an hour ago. Avoids generating the maptile twice on startup.
 2012-03-29 22:34:33 +02:00
Michael Cerquoni aka Nebadon Izumi
dc978d02a7 match water color for warp3d map tiler and adjust lighting 2011-06-13 12:37:43 +01:00
Justin Clark-Casey (justincc)
41105948bd remove some mono compiler warnings 2011-01-21 23:19:52 +00:00
Teravus Ovares (Dan Olivares)
09bf9d5fca * AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer. 2010-10-30 02:26:48 -04:00
Melanie
d45276b3f6 Add and plumb the usetex URL parameter to worldview. Required but not yet 
functional
 2010-10-06 05:44:19 +01:00
Melanie
c97398575c Convert the map image modules to new style modules 2010-10-06 01:42:18 +01:00
Melanie
b424af6187 Revert an accidental default value change 2010-10-05 23:06:29 +01:00
Melanie
eb491d2c36 Patch to allow other cam angles. Not complete. Thanks, Antont. 2010-10-05 22:56:20 +01:00
Latif Khalifa
cb6e4035c7 Avoid throwing errors when adding existing meshes to the render scene 2010-10-04 06:02:09 +01:00
Melanie
4f70ac018b Adapt to core changes 2010-10-03 16:40:11 +01:00
Melanie
27340f616e Addign the new / renamed files for previous commit 2010-10-03 16:34:55 +01:00