Commit Graph

568 Commits

Author SHA1 Message Date
UbitUmarov
722b7cfbb2 bug fix 2016-07-31 19:35:10 +01:00
UbitUmarov
703e96b4cb Change RegionInfoCache again... 2016-07-31 19:08:35 +01:00
UbitUmarov
db7f1aaa2f cleanup to go break something else 2016-07-31 00:03:48 +01:00
UbitUmarov
0509badcc1 another try on jenkins 2016-07-30 23:56:54 +01:00
UbitUmarov
78d9312fc8 move some code back to AddRegion because some tests dont issue RegionLoaded 2016-07-30 23:23:28 +01:00
UbitUmarov
7b55348360 still on jenkins 2016-07-30 22:44:41 +01:00
UbitUmarov
f4385dcd92 do not set m_RegionInfoCache null on each LocalGridServicesConnector construction 2016-07-30 22:26:31 +01:00
UbitUmarov
7ae4211635 test jenkins for the null object 2016-07-30 22:19:25 +01:00
UbitUmarov
4599b3ecfd test jenkins for error line number 2016-07-30 22:05:55 +01:00
UbitUmarov
2826f713d4 stop creating caches on all standalone regions on a single instance ( why are shared modules been created on every scene?? ) 2016-07-30 21:25:26 +01:00
UbitUmarov
9a4afa753b fix NULL references added in recente changes in standalone mode 2016-07-30 20:56:19 +01:00
UbitUmarov
e62f8fd09e change RegionInfoCache expires control 2016-07-30 20:08:14 +01:00
UbitUmarov
bf593dd6f4 fix RegionInfoCache keys compare, remove RegionCache now replaced by RegionInfoCache 2016-07-30 17:14:17 +01:00
UbitUmarov
79b7787eff let LocalGridServiceConnector also have a RegionInfoCache, use the remote one if this is active. 2016-07-30 14:35:43 +01:00
UbitUmarov
b44b898331 remove a unused parameter 2016-07-30 03:45:58 +01:00
UbitUmarov
a1759292c8 add a regionInfoCache cache add region with expire time option 2016-07-30 03:31:03 +01:00
UbitUmarov
202212bcbc add a regionInfoCache get by world 2D position 2016-07-30 03:13:23 +01:00
UbitUmarov
55b2d01028 in RegionInfoCache, replace lib omv ExpireCaches by a single dedicated one 2016-07-30 01:44:33 +01:00
UbitUmarov
f4fa891928 waste another thread job on another thing that should be part of a more
unified service, and also not hidding on a so called event"
2016-07-27 02:54:49 +01:00
UbitUmarov
f19b3d28bd do GridUserService.SetLastPosition async on crossings 2016-07-26 22:09:06 +01:00
Melanie Thielker
ea8f3c83bf Finally remove the requirement for an InventoryItem/FolderBase object to
be passed into inventory queries.
This makes the API more homogenous and also will more clearly show
coding
errors related to HG inventory where the .Owner field has a meaning
for a query but wasn't always set.
2016-07-04 03:35:48 +01:00
Diva Canto
193a3afa64 Make a debug message less misleading. 2016-06-22 15:28:18 -07:00
UbitUmarov
da1c347676 temporary assets are as local 2015-12-19 15:05:49 +00:00
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