Commit Graph

1708 Commits (2e4c8798abf539bddd9770b162acb6d3f3a105ac)

Author SHA1 Message Date
Melanie Thielker 8239e29be7 Change the user verification call back to use the host name instead of the
IP address. Fixes NGINX on OSGrid getting confuzzled.
2016-07-11 22:31:32 +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 758e1e2535 Mantis #7933: copy-paste bug in avn code. 2016-06-23 13:53:42 -07:00
Diva Canto 56e2358ec2 Because there's no such thing as too much culture. (looking forward to .NET 4.5 to set this globally) 2016-06-22 20:31:01 -07:00
Diva Canto 94616510f2 Missing AsBoolean 2016-06-22 15:39:09 -07:00
Diva Canto ea3fe90ddb Mantis #7928: show grid size and show regions now working. Integers were being overflown. 2016-06-19 13:57:01 -07:00
Melanie Thielker 59ed89769a Apply user specified default perms across the board, to items uploaded as well as items created and to rezzed prims in world.
This effectively removes the concept of "default permissions" from OpenSim
because all known modern viewers set the permissions flags on login.
Ancient abandoned viewers will now default to the SL defaults.
2016-04-29 22:36:56 +02:00
Melanie Thielker 110297793c Fix a couple of typos 2016-03-05 22:22:09 +01:00
Melanie Thielker 15b9601393 Introduce UseOsgridFormat config to select the OSGrid specific path name
generator
2016-03-05 01:26:28 +01:00
Melanie Thielker 74c2113bce Port the safer database access and the cure for "Chicken Bones" which
are artefacts that can be created by fsck and would make standard
FSAssets choke. These refinements were tested on OSGrid.
2016-03-05 01:17:42 +01:00
Diva Canto ab12a14279 Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore. 2016-02-21 11:14:02 -08:00
UbitUmarov b29ab1b2df adjust the checks for invalid asset IDs. changed upload fail detection 2015-12-19 15:03:22 +00:00
UbitUmarov b1c4f69154 fix protocol version to max wearables mapping 2015-12-01 19:49:27 +00:00
Melanie Thielker f42522b510 Fix protocol versions to wearables count mapping 2015-12-01 16:07:47 +01:00
UbitUmarov 87464b5039 remove a debug message 2015-11-24 02:03:38 +00:00
UbitUmarov 9d8fe7f3db revert previus commit 2015-11-23 23:10:02 +00:00
UbitUmarov 81eb9816a2 remove libomv detection/log from llLoginService 2015-11-23 23:03:16 +00:00
UbitUmarov 156fdd4908 remove some duplicate using statements 2015-11-21 01:49:31 +00:00
Melanie Thielker 6bb12ab975 Set wearables count to max legacy wearables for version < 0.4 2015-11-02 00:45:05 +01:00
Melanie Thielker f88e4a1ec9 Plumb the rest of the context stuff. Well, what I see so far anyway 2015-11-02 00:23:38 +01:00
Melanie Thielker 5f18f2ce6a More EntityTransferContext plumbing 2015-11-01 19:37:14 +01:00
Melanie Thielker 69585a4824 More plumbing of the EntityTransferContext (not yet complete) 2015-11-01 19:11:14 +01:00
UbitUmarov 29798cefcc Merge branch 'master' into avinationmerge 2015-11-01 04:12:17 +00: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 6510ba8a64 Plumb the special VeriableWearablesSuported field which we will
temporarily use to determine extended wearableness
2015-11-01 01:15:31 +01: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 dc6bdbf740 Put back the option of having asymmetrical protocol versions in
transfers
2015-10-31 16:57:24 +01:00
UbitUmarov 1030d07f31 simplify new regions protocol version control. (May not work, and babies safety warnings still valid 2015-10-31 12:57:14 +00:00
UbitUmarov 400c61cd60 fix teleport to to string version regions 2015-10-31 00:06:30 +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
UbitUmarov 8b1ae501b5 fix services handling of visualparameters, avoiding possible crashs (mantis 7732) partially appling code from avinationmerge 2015-10-27 18:39:33 +00:00
Diva Canto afba4dc1ce Mark XAssetService obsolete and warn users. 2015-10-21 19:26:00 -07:00
Diva Canto 719c0d09ae Mark XAssetService obsolete and warn users. 2015-10-21 19:22:20 -07:00
Diva Canto 59b63b6406 On to 0.8.3!
Conflicts:
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
2015-10-18 21:51:49 -07:00
Diva Canto 06d2508b96 On to 0.8.3! 2015-10-18 21:47:10 -07: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
Diva Canto 073bdda4b8 Restored authentication in AssetServicesConnector. 2015-10-14 15:26:26 -07:00
UbitUmarov 6ded1da9f2 ... merge issue 2015-09-28 15:49:22 +01:00
UbitUmarov c4ef8984a3 clear merge issue 2015-09-28 15:21:23 +01:00
UbitUmarov 239dcaffb7 coment out some debug, clean a bit 2015-09-26 14:14:05 +01:00
UbitUmarov 19c5f9ce1d fix bad side efects of missing avination optional configuration 2015-09-15 21:33:26 +01:00
Melanie Thielker f24414c063 Remove the last proprietary copyright headers, insert BSD ones. 2015-09-13 21:03:38 +02:00
UbitUmarov 410ae96d04 put back diva's cache with her recent fix but also avoid duplicated InventoryService.UpdateItem call in case of m_uploadState is complete. In that case CompleteItemUpload will do it 2015-09-11 22:26:05 +01:00
UbitUmarov af0febf6a7 inventory mess 2015-09-11 19:55:38 +01:00
Diva Canto 29aaf5564f Mantis #7720: AssetXferUploader was setting AssetID to UUID.Zero. Before that wouldn't matter (item would be a terminal object) but with the introduction of the item cache, it matters, because the object in the cache was being modified to have AssetID=UUID.Zero. Also keeping the item cache consistent when item properties change. 2015-09-11 09:48:51 -07:00
UbitUmarov 6a0465b70a remove diva's inventory cache since it seems to cause mantis 7720, broken items UUID. Guess it doesn't cover all paths 2015-09-11 04:46:15 +01:00
UbitUmarov b93412972e revert SynchronousRestObjectRequester timeout to miliseconds, and fix where it was wrong set in seconds 2015-09-09 23:17:18 +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