Commit Graph

1760 Commits (0d538cb24ce9d9e05e721eedd9761106a45d1fdb)

Author SHA1 Message Date
UbitUmarov 908b5e8526 revert that and actually don't loose the estates :) 2016-08-02 01:37:47 +01:00
UbitUmarov b1ef269dd3 add a extra null check on epxirecache out ( ?? ) 2016-08-02 01:15:53 +01:00
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
Diva Canto 82ea4179da Clean up viewer-based access control specifications. 2015-09-06 10:00:20 -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
UbitUmarov ecfd442c9b cache in memory water texture 2015-08-30 11:02:59 +01:00
UbitUmarov 46054d4f02 review ServiceBase for var 2015-08-28 20:54:59 +01:00
UbitUmarov ee4f61fe34 review llLoginService for var support 2015-08-28 20:49:29 +01:00
UbitUmarov f2259d37e2 review gridservice module. Not merged os code for varsize, since that
should be handle at db level
2015-08-28 20:26:24 +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
Melanie Thielker 17e920aacd More plumbing on agent states 2015-08-20 00:40:49 +02:00
Melanie Thielker 028506cf3c Partial plumbing for the agent stateful module features negotiation 2015-08-20 00:18:45 +02:00
Diva Canto 4cbbbefbf6 Removed ignoreCase=true from the call to Type.GetInterface, because, well, we don't want to ignore case. And this seems to be causing problems in mono 4.3. 2015-08-15 16:08:14 -07:00
Diva Canto d9a9f6f43b Convert the enum to int before casting it to string for DB query 2015-08-08 13:47:42 -07: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
Cinder f218cbd29d max-agent-groups support
Robust now tells viewers what the maximum number of groups is. Viewers show this limit to the users, and enforce it.

The default is 42, which is what viewers had assumed was the maximum number before this update.

Signed-off-by: Oren Hurvitz <orenh@kitely.com>
2015-08-07 07:42:26 +01:00
Oren Hurvitz c4f8630968 In the AgentCircuitData of HG users, set the last name to include the port
E.g., instead of "first.last @grid.example.com", the name is now "first.last @grid.example.com:8002"
2015-08-03 16:25:45 +03:00
AliciaRaven ce62824b1f Add HGFSAssetService to the HypergridService to provide HG support for FSAssets. 2015-08-02 20:02:36 +01:00
Diva Canto c8cd2f18f5 Mantis #7657: similar fixes for FSAssets. 2015-08-01 20:27:04 -07:00
Diva Canto e5a1243abc Mantis #7657 and #7514. This should alleviate the problem of bad object assets being passed around via HG and archives. No guarantees that all the leaks have been found, but at least it detects and fixes these bad assets upon:
(1) storing and getting assets over HG -- assuming the core HG asset service is being used (not the case with OSGrid!)
(2) importing assets via OAR and IAR

Instantiation of bad assets now should also work, instead of producing an exception, but the bad assets themselves aren't being fixed in the DB. That should be done with a cleaning tool -- see Perl script in Mantis #7657.

Virus!
2015-08-01 18:58:05 -07:00
Diva Canto 32d87aa168 Mantis #7664: Added IHypergridLinker interface to establish a contract about what implementers need to provide publicly. This is used by 3rd-party addons such as Wifi. 2015-08-01 09:30:34 -07:00
Cinder 368ea78d14 Show last online status of group members from the PresenceService in group profiles
Signed-off-by: Oren Hurvitz <orenh@kitely.com>
2015-07-31 17:19:13 +01:00
Oren Hurvitz 43c8e2396e Added locking to HypergridLinker, to prevent problems if multiple linking requests for the same region are handled simultaneously 2015-07-22 20:39:30 +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 248c0e18de Prevent multiple instances of the FSAssets service causing problems. Protect against secondary instances registering duplicate console commands Also prevents multiple instances each starting a writer thread which will cause major file access exceptions as they fight over the contents of the spool directory.
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-07-13 19:04:33 +02:00
AliciaRaven f3f748ed11 Bringing FSAssets more inline with current OpenSim standards. * If no connection string found in assets config, fallback to using default database config * Create database storage interface to allow other db connectors to be written at some point * Add MySQL migrations file to create the initial db table * Added new config option named DaysBetweenAccessTimeUpdates to reduce db load by only updating access times when fetching assets if the last access time was over the threshold. This idea was taken from XAssets service. * Change log message headers to indicate FS assets is the source not just assets
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-07-12 04:03:08 +02:00
Melanie Thielker c59144ff13 More cleanup, add missing refs to prebuild, remove refs to stuff not
used. Will NOT compile.
2015-07-11 19:27:19 +02:00
Melanie Thielker a343c07d12 Some cleanup, add prebuild project, correct path 2015-07-11 19:21:32 +02:00
Melanie Thielker 2672637202 Rename for uniformity, add data module 2015-07-11 19:10:39 +02:00
Melanie Thielker db62e1ac3c Add main FSAssetsService 2015-07-11 19:07:42 +02:00
Diva Canto c299414d50 Fixed bad-ish code in login patch 2015-06-25 15:01:43 -07:00
Quill Littlefeather 4131fbea0c Changes to Welcome Message sent to clients.
.gitignore                                        |  1 +
 OpenSim/Services/LLLoginService/LLLoginService.cs | 32 +++++++++++++++--------
 1 files changed, 22 insertions(+), 11 deletions(-)

Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-25 14:53:51 -07:00
Diva Canto bcb8a7d7f9 A few bug fixes for Agent Preferences to actually work. Also added missing config for standalone. 2015-06-13 08:36:06 -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 b931f393a8 Avoid registering console commands in every single instance of GridUserService running on the same process. Only one registers them now. 2015-06-09 13:21:41 -07:00
Diva Canto c4efeb0f7c Upgraded the Simian inventory connector with an item cache, too, so that it doesn't get awfully out of sync with the improvements I'm making to the robust service connectors, which are being fully leveraged by the simulator. This Simian connector needs more love... 2015-06-05 11:46:13 -07:00
Diva Canto 96f0c6f074 More on mantis #7567. Two things:
- Increase the inventory cache timeout to 20 secs, so that the items will still be there when they are needed by the sim for rezzing
- Before rezzing attachs, make a call to GetMultipleItems so to fetch them all at the same time
2015-06-05 10:07:50 -07:00
Diva Canto 51fccff235 Mantis #7600. The warning message was not a symptom of a problem, it was just that the HG client was trying to fetch folders that aren't in the Suitcase, so that fails. This should make the warning message go away in that situation. (fetching those folders will still fail, because they aren't available over HG) 2015-06-04 15:04:36 -07:00
Diva Canto a433a40980 Making the inventory cache static, so that there's less timers. 2015-06-04 07:10:06 -07:00
Diva Canto ea5aa82c2c Mantis #7567. Once again, avoiding prefetching linked items within linked folders. Also fixing the inventory connector GetMultipleItems, so that if everything is in the cache, it returns successfully rather than unsuccessfully. 2015-06-04 06:58:07 -07:00
Diva Canto bac53387a9 Mantis #7567: added an 8-sec expiring item cache to the inventory network connector. This fixed the problem on my local test grid and generally made things faster. This cache has been needed for a while... there are many parts in the code where the sim gets an item multiple times in a short amount of time (rezzing attachs and objects, for example).
Other minor changes:
- added the scene as a parameter to the constructor od FetchInvDescHandler, so that I could see in which scene the handler was being called
- brought linked items in linked folders back to being prefetched
2015-06-03 17:42:41 -07:00
Diva Canto 923a57a91f Added tests for UserAccountService in Robust. In the process fixed a couple of bugs in the network connectors. For some reason the robust-bound code had a CreateUser method, while the client-bound code had no such method. I assume someone is extending the client-side code with their own connectors. I added the missing method, but didn't add it to the service interface. 2015-05-11 19:55:23 -07:00
Diva Canto 3df472f10d Added inventory tests to Robust.Tests. 2015-05-11 08:52:12 -07:00
Diva Canto 3c596e47c6 Knocked off a few compiler warnings regarding unused variables. 2015-05-10 21:54:24 -07:00
Diva Canto eb9b16d284 Added simple test for IM in Robust too.
Changed Inventory data to use the mock one in Common Tests. (but still not inventory tests)
2015-05-10 21:49:24 -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 3548e39f9a I shouldn't write code this early in the morning... Fixing a 'duh' on previous commit. 2015-05-08 07:36:30 -07:00
Diva Canto a68aab14fa Additional debug message to help diagnose a warning message and exception related to previous commit.
See http://opensimulator.org/mantis/view.php?id=7054#c28282
2015-05-08 06:57:06 -07:00