ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,120 Commits 5 Branches 93 Tags
72876fc68385861e06fd900707c3a7c28d040a7d
Commit Graph

33 Commits

Author SHA1 Message Date
UbitUmarov
583c874773 remove default of 60minutes on MapImageService Refresh time, forgotten from early merge debug 2015-11-25 03:21:38 +00:00
Diva Canto
aea86f30a0 Don't crash the sim if the map image is null. 2015-11-01 11:38:41 -08:00
UbitUmarov
cdaed11387 at last we can login and see objects ( friends is dead and disable in 
scenepresence)
 2015-09-03 18:39:08 +01:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
UbitUmarov
cbc569a1e0 rename ImapTileModule as IMAPImageUploadModule to match core 2015-08-24 11:06:12 +01:00
UbitUmarov
24a093035b more fixes on map 2015-08-23 01:42:51 +01:00
UbitUmarov
5da9979024 Warp3D map now seems to work 2015-08-22 16:35:49 +01:00
AliciaRaven
297d31b1c2 Prevent two maptiles being generated at startup, one for v1 and another for v2-3 service. * v1 Service (WorldMapModule) is called directly by scene on startup. This patch moves the initial map registration of the v2-3 service (MapImageServiceModule) to that point so they can share the bitmap instead of doubling the work of Warp3D and exasperate its memory leak issues. 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-07-21 15:11:47 -04:00
Robert Adams
c0ad5ee81d varregion: update MapImageServiceModule to upload multiple map tiles for large regions. 2015-03-29 17:21:19 -07:00
Justin Clark-Casey (justincc)
9fcee73326 Make "generate map" console command also trigger upload to maptiles as well as asset generation without performing tile generation twice. 2014-09-26 01:02:19 +01:00
Melanie Thielker
1fc5dadc60 Add an admin message to refesh a region's map tile. Will be used to periodically 
rebuild the world map to clean out unused tiles.
 2014-08-23 19:38:08 +02:00
Melanie Thielker
1a7efc2c64 Change the map tile system to be multi-grid hosting compatible 
Conflicts:

	OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
 2014-08-23 17:33:14 +02:00
Dev Random
7112ee0015 Enable MapImageServiceModule with no refresh 2014-03-11 23:52:11 +00:00
Robert Adams
54a4b9eab4 varregion: Update Warp3D to properly handle varregions. 
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
 2014-01-19 07:33:56 -08:00
Robert Adams
60de0bc3c2 varregion: split up generated maptile images for storage in map. This 
makes maps for varregions show up properly.
 2014-01-19 05:09:03 -08:00
Robert Adams
13a9a4b653 varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. 
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
 2013-12-14 07:53:01 -08:00
Robert Adams
317c04fe17 VarRegion: change RegionInfo storage of region coordinates from region 
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
 2013-09-28 07:33:52 -07:00
Melanie
7482ad1c22 Merge branch 'master' into careminster 2013-02-04 19:21:39 +00:00
Justin Clark-Casey (justincc)
9588328242 Stop exceptions being thrown if GenerateMapTiles = false but no static map tile has been set. Do more informative warn instead. 2013-02-02 00:59:26 +00:00
Melanie
9a5679876e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
 2012-11-13 02:10:09 +00:00
Diva Canto
86903f23dd Cleanup on region modules: gave short node id's to all of them. 2012-11-12 18:08:02 -08:00
Melanie
771d79e83e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml
 2012-07-28 00:39:36 +01:00
Justin Clark-Casey (justincc)
31304c222d Make SceneManager.OnRegionsReadyStatusChange event available. 
This is fired when all regions are ready or when at least one region becomes not ready.
Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
 2012-07-25 21:00:59 +01:00
Melanie
36d744e2a5 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-07-19 09:47:51 +01:00
Justin Clark-Casey (justincc)
4973fddc51 Establish EventManager.OnRegionReady event. This will only be triggerred once when the region is ready. 
Switch MapImageServiceModule to use this.
 2012-07-18 21:52:07 +01:00
Justin Clark-Casey (justincc)
6460e587c4 Pass entire scene object in OnLoginsEnabled event rather than just the region name. 
This saves listeners from having to re-retrieve the scene from their own lists, which won't work anyway if multiple regions with the same name have been allowed
 2012-07-18 21:29:12 +01:00
Melanie
dcbcbd697f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
 2012-04-27 22:28:09 +01:00
Diva Canto
9bc94c502a MapImageService: changed the event at which the map tiles are uploaded, because they were being uploaded before the region was registered with the grid 2012-04-27 11:05:40 -07:00
Melanie
b9d61d5413 Allow the map tile module to be enabled without also eabling refresh 2012-03-29 15:38:12 +02:00
Justin Clark-Casey (justincc)
014cd4f8bb remove mono compiler warnings 2011-08-23 21:41:16 +01:00
Diva Canto
409738726d Added a couple of guards and warnings to the MapImage/MapImageServiceModule. 2011-06-16 17:14:41 -07:00
Diva Canto
fd57c91b4a First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD. 2011-06-12 15:37:42 -07:00