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,561 Commits 5 Branches 93 Tags
0991ad321ae87fdaeb4fc2c92bb17df55b026653
Commit Graph

1084 Commits

Author SHA1 Message Date
UbitUmarov
d1737de8d2 work around some 'tests' errors: Coalesced objects handling has changed 2015-11-17 03:10:59 +00:00
Melanie Thielker
69585a4824 More plumbing of the EntityTransferContext (not yet complete) 2015-11-01 19:11:14 +01:00
UbitUmarov
24472c3b67 fix merge issues 2015-11-01 03:25:36 +00: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
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
UbitUmarov
ed909f56da fix mantis 7734, Thanks Garmin for the report 2015-10-31 13:22:50 +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
31873485d9 do not send DisableSimulator on teleport if agent is already returning 2015-10-02 02:42:25 +01:00
UbitUmarov
6ae7341e42 send DisableSimulator messages on closing childagents. Possible still not on at best timming, or on the right source files 2015-10-01 20:50:12 +01:00
UbitUmarov
07a8618c56 revert previus wrong commit 2015-09-25 21:43:51 +01:00
UbitUmarov
40ae9ec554 patch objects crossings for var regions, until region location is fully fixed 2015-09-25 18:38:52 +01:00
UbitUmarov
812e808cee remove messages on agents cross fails that got merged 2015-09-17 08:18:35 +01:00
UbitUmarov
9ac01010f4 change point of evocation of AgentHasMovedAway for HG 2015-09-16 04:32:09 +01:00
UbitUmarov
2bd7bbd1cb restore some avn code, fixing for var regions 2015-09-16 02:25:12 +01:00
UbitUmarov
5becc16acf try to improve vehicles crossing with Xengine. Lag seems main issue now, but needs testing, specially the fail cases, that most likelly need more work 2015-09-14 16:40:01 +01:00
UbitUmarov
dfc142a50f try to be more friendly to HG 2015-09-12 14:37:07 +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
UbitUmarov
c1a4786be0 still a missing stat ID 2015-09-06 01:01:31 +01:00
UbitUmarov
0ddcc55166 let extra stats travel side by side with viewers ones... try to fix damm array indexes all over the place 2015-09-06 00:32:20 +01:00
UbitUmarov
2130984bef a few changes to stats. Array order coerent on users. give up on moses stats for now, since SimExtraStatsCollector cant reach SimStatsReport etc 2015-09-04 23:07:25 +01: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
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
Diva Canto
134d4300f0 All physics plugins are now region modules. Compiles but doesn't run. 2015-08-31 13:02:51 -07:00
Diva Canto
ce2c67876e More namespace and dll name changes. Still no functional changes. 2015-08-30 21:05:36 -07:00
Diva Canto
2c0cad6dd3 Renamed the namespaces too 2015-08-30 20:29:31 -07:00
UbitUmarov
0edffae7e4 more on tps and crossings 2015-08-30 19:17:35 +01:00
UbitUmarov
bd11311845 improve object crossings 2015-08-29 09:18:34 +01:00
UbitUmarov
b114a04ed4 fix NeighborRegions code 2015-08-29 03:41:43 +01: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
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
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
BlueWall
3c2886cd75 Adding back command to clear region's user cache 2015-05-13 14:31:28 -05: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
Diva Canto
1abbad71b4 Refactored some code that is used in two different dlls related to SOP rewriting. Also added some unit tests that relate to mantis #7514 2015-05-05 20:59:09 -07:00
Diva Canto
877371411a Mantis #7514 
I think this is it -- a bug introduced back in October, where the prefix and name space were being added twice on HG asset posts bu simulators.
 2015-05-02 22:18:58 -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
Robert Adams
d74d74c910 varregion: restore checkAgentAccessToRegion routine in EntityTransferModule. 2015-03-27 06:47:55 -07:00
Robert Adams
9f18e3ba80 Varregion: first cut at removing Border class checks for region crossings. 
Added Scene.PositionIsInCurrentRegion(pos) to sense when new position needs some crossing work.
Many changes made to EntityTransferModule to accomodate new crossing sense logic.
 2015-03-22 21:53:02 -07:00
Justin Clark-Casey (justincc)
0aeea89258 Fix script state not being preserved in objects sent via Hypergrid. 
This was because attributes were not being included in the transformation, hence losing the script state identity.
Symptoms are messages like "[SCENE OBJECT GROUP]: SavedScriptState element had no UUID in object test box"
Regression since the conference code merge.  Regression test extended for this case.
Relates to http://opensimulator.org/mantis/view.php?id=7439
 2015-03-13 20:09:29 +00:00
Freaky Tech
5a413c1b2f adjusted new UserManagementModule to accept the HG UUI test harness 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2015-03-05 17:19:39 -05: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)
5fa651c529 minor: In HGAssetMapper, don't complain on seeing an XmlDeclaration as we know that we not using those in transformation. 
Relates to http://opensimulator.org/mantis/view.php?id=7447
 2015-02-25 21:42:07 +00:00
Justin Clark-Casey (justincc)
c67b3407d4 In HGAssetMapper.RewriteSOP(), don't explicitly end the document. 
The document here has no <?xml declaration.  Though ideally it may be present, in practice it has not been added as the data here is embedded within an asset
On Mono 3.2.8 and probably other versions, calling WriteEndDocument() without a declaration does nothing.
On Windows .NET, the same operation throws a "Document does not have a root element" exception which may be contributing to Mantis 7397 and possibly 7439
 2015-02-21 00:08:49 +00:00