ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-19 14:35:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,653 Commits 5 Branches 93 Tags
b453ef0fbd3cc54752e97df9738bbc4a8a7c19d4
Commit Graph

545 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
UbitUmarov
9b6633697b coment out excessive debug messages 2015-11-16 17:35:20 +00:00
Melanie Thielker
3da0a318b3 Merge branch 'avinationmerge' of opensimulator.org:/var/git/opensim into avinationmerge 2015-11-01 23:40:54 +01:00
Diva Canto
aea86f30a0 Don't crash the sim if the map image is null. 2015-11-01 11:38:41 -08:00
Melanie Thielker
69585a4824 More plumbing of the EntityTransferContext (not yet complete) 2015-11-01 19:11:14 +01:00
UbitUmarov
72684592ba Merge branch 'master' into avinationmerge 
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/Servers/ServerBase.cs
	OpenSim/Framework/VersionInfo.cs
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
	OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
	OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/GatekeeperService.cs
	OpenSim/Services/Interfaces/IAvatarService.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
 2015-11-01 03:01:59 +00:00
UbitUmarov
af4ca8e80e fix internal support for non square regions 2015-10-31 21:58:40 +00:00
Melanie Thielker
ea56f4f27c Introduce an EntityTransferContext carrying the version numbers to pass 
to all interested functions. Should fix the varregion conditional.
Still a testing version, do NOT use in production!
 2015-10-31 18:13:02 +01:00
Melanie Thielker
e8e0ba6d8f Remove testing cruft that is blocking the new protocols. Unit tests no 
longer test TP v1 now.
TP v1 will be removed within 6 months anyway.
 2015-10-31 17:22:27 +01:00
UbitUmarov
9232876421 let silly tests override version on local connections 2015-10-31 02:05:11 +00:00
Melanie Thielker
dc6d9eadf3 Testing stage of the new versioning system. Use at own risk. May not 
work. Will eat your babies. Yada. Yada.
 2015-10-31 00:01:35 +01:00
Diva Canto
7ab633461e Fixed merge conflicts 
Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2015-10-18 16:24:33 -07:00
Diva Canto
70a46fe090 Clean up of simulation version, the number that rules the compatibility of teleports: 
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
 2015-10-18 16:06:31 -07:00
UbitUmarov
239dcaffb7 coment out some debug, clean a bit 2015-09-26 14:14:05 +01:00
UbitUmarov
0fb033e567 fix object crossings to other scene on same instance 2015-09-26 01:31:57 +01:00
UbitUmarov
280780d3bc let regionCache really find a varregion by a position 2015-09-12 15:27:36 +01:00
Robert Adams
e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905. 
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
 2015-09-08 04:54:16 -07:00
Diva Canto
d00f73c3a4 Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework. 2015-09-04 14:39:23 -07: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
Diva Canto
11194209df First commit where physics work as region module. 
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
 2015-08-31 14:09:15 -07:00
UbitUmarov
ce883e9b43 add more of the v03 checks and homeURL. Sending side only for now 2015-08-26 05:29:08 +01:00
UbitUmarov
73124f22cc change teleport version number to v0.3, without actually adding the checks 
for 0.7 sims, etc that we don't have. Also still not using the homeURL
added in core.
 2015-08-26 03:21:48 +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
Melanie Thielker
028506cf3c Partial plumbing for the agent stateful module features negotiation 2015-08-20 00:18:45 +02:00
Diva Canto
959872315f WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum. 
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
 2015-08-08 12:12:50 -07:00
Oren Hurvitz
e979a7e7f0 Fixed bad log message 
This fixes http://opensimulator.org/mantis/view.php?id=7661
 2015-07-31 17:55:09 +03:00
Oren Hurvitz
83da582261 Removed unused code related to DNS lookups 2015-07-23 14:50:50 +03:00
Oren Hurvitz
3a2d4c8b05 Added logging in places where regions are searched for by their location 
This commit also fixes the log message "Region already exists in coordinates <{0},{1}>": it was actually showing the *requested* coordinates, instead of the coordinates of the previously-existing link.
 2015-07-22 20:13:53 +03: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
Cinder
044654b5a9 Guard against scenes without an agent prefs service and a copy and paste fix 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-06-13 13:37:08 -07:00
Cinder
0fa94f222d Refactor AgentPreferences so that database operations happen centrally. the opensim way. 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-06-13 07:27:42 -07:00
Diva Canto
0bf1209f90 Another major overhaul of inventory downloading, this time pertaining to inventory links. Added yet another function to IInventoryService to get multiple items at once, so that fetching collections of linked items is done once per folder instead of once per item. 2015-05-08 20:53:28 -07:00
Diva Canto
c74cef0f42 Major change in the way inventory is downloaded: added a method throughout IIventoryService that fetches sets of folders at once. Also added folder id in the InventoryCollection data structure, so that we don't need to go to inventory server again just for that. This reduces the chatter between sims and inventory server by... a lot. On my tests, this reduces initial inventory download down to 30% of what it currently is. 2015-05-07 19:24:08 -07:00
Robert Adams
c0ad5ee81d varregion: update MapImageServiceModule to upload multiple map tiles for large regions. 2015-03-29 17:21:19 -07:00
Robert Adams
07dead7dcb varregion: any conversions of use of Constants.RegionSize converted into 
Util.cs routines to convert region coords to and from world coords or handles.
 2015-03-29 14:25:12 -07:00
Freaky Tech
0ea6977013 solving HG IM, HGFriends issues based on falsified GridUser data 
it does not consider GridUser as a viable source for residents' data.
it does not consider Friends, Inventory Creators to be trusted at all. There are lots of broken entries in existence.

There are lots of broken creator data fields in assets.

The following issues arise from the broken data in the old User Management Module:

failing HG IM
failing HGFriends Requests

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2015-03-05 16:17:12 -05:00
Justin Clark-Casey (justincc)
86367d7219 refactor: Move methods to start a monitored thread, start work in its own thread and run work in the jobengine from Watchdog to a WorkManager class. 
This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management.
Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget.
Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
 2014-11-25 23:56:32 +00:00
Justin Clark-Casey (justincc)
ec8d21c434 Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis. 
"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.
 2014-11-25 23:23:10 +00:00
Justin Clark-Casey (justincc)
8ddcd16c69 Add an IConfigSource constructor to HGAssetBroker so that it can be instantiated directly for potentially handling some capabilities directly in services with HG active 2014-11-25 23:21:38 +00:00
Justin Clark-Casey (justincc)
93f3444de1 minor: remove warnings from unused fields in LocalGridServicesConnector 2014-11-25 23:21:37 +00: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
Justin Clark-Casey (justincc)
41f2f3132b For monitoring purposes, start non-timeout tasks (which do not currently use a threadpool) via Watchdog.RunInThread() rather than Util.RunThreadNoTimeout() 
The functionality is the same but this allow us to monitor such tasks via "show threads" and abort them for test purposes, etc.
Also extends thread names to provide more info (e.g. SendInitialDataToClient says what client the task is for).
 2014-09-05 23:20:59 +01:00
Melanie Thielker
9ce1fd7a3c Merge branch 'avination-current' 2014-08-23 19:39:31 +02: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
Melanie Thielker
cbd7c7b9ec Change the map tile system to be multi-grid hosting compatible 2014-08-23 17:27:01 +02:00