aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* add some wiring to have GetUserAccounts for multiple IDs on a single ↵UbitUmarov2016-08-132-0/+78
| | | | request to grid services. Unfinished, untested
* revert that and actually don't loose the estates :)UbitUmarov2016-08-021-6/+6
|
* add a extra null check on epxirecache out ( ?? )UbitUmarov2016-08-021-3/+3
|
* Change the user verification call back to use the host name instead of theMelanie Thielker2016-07-111-1/+5
| | | | IP address. Fixes NGINX on OSGrid getting confuzzled.
* Finally remove the requirement for an InventoryItem/FolderBase object toMelanie Thielker2016-07-042-23/+20
| | | | | | | | 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.
* Because there's no such thing as too much culture. (looking forward to .NET ↵Diva Canto2016-06-221-0/+2
| | | | 4.5 to set this globally)
* Missing AsBooleanDiva Canto2016-06-221-1/+1
|
* Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global ↵Diva Canto2016-02-211-1/+1
| | | | replace anymore.
* adjust the checks for invalid asset IDs. changed upload fail detectionUbitUmarov2015-12-191-16/+16
|
* fix protocol version to max wearables mappingUbitUmarov2015-12-011-1/+3
|
* Fix protocol versions to wearables count mappingMelanie Thielker2015-12-011-1/+3
|
* Set wearables count to max legacy wearables for version < 0.4Melanie Thielker2015-11-021-0/+5
|
* Plumb the rest of the context stuff. Well, what I see so far anywayMelanie Thielker2015-11-021-0/+4
|
* More EntityTransferContext plumbingMelanie Thielker2015-11-012-5/+4
|
* More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-013-10/+12
|
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-011-0/+2
|\
| * Plumb the special VeriableWearablesSuported field which we willMelanie Thielker2015-11-011-0/+2
| | | | | | | | temporarily use to determine extended wearableness
* | Merge branch 'master' into avinationmergeUbitUmarov2015-11-012-10/+31
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Introduce an EntityTransferContext carrying the version numbers to passMelanie Thielker2015-10-311-7/+10
| | | | | | | | | | to all interested functions. Should fix the varregion conditional. Still a testing version, do NOT use in production!
| * Put back the option of having asymmetrical protocol versions inMelanie Thielker2015-10-311-3/+5
| | | | | | | | transfers
| * simplify new regions protocol version control. (May not work, and babies ↵UbitUmarov2015-10-311-2/+2
| | | | | | | | safety warnings still valid
| * fix teleport to to string version regionsUbitUmarov2015-10-311-1/+1
| |
| * Testing stage of the new versioning system. Use at own risk. May notMelanie Thielker2015-10-311-8/+24
| | | | | | | | work. Will eat your babies. Yada. Yada.
| * On to 0.8.3!Diva Canto2015-10-181-1/+1
| |
| * Mantis #7720: AssetXferUploader was setting AssetID to UUID.Zero. Before ↵Diva Canto2015-09-111-1/+9
| | | | | | | | 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.
* | On to 0.8.3!Diva Canto2015-10-181-1/+1
| | | | | | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* | Restored authentication in AssetServicesConnector.Diva Canto2015-10-141-2/+2
| |
* | fix bad side efects of missing avination optional configurationUbitUmarov2015-09-151-11/+16
| |
* | put back diva's cache with her recent fix but also avoid duplicated ↵UbitUmarov2015-09-111-1/+8
| | | | | | | | InventoryService.UpdateItem call in case of m_uploadState is complete. In that case CompleteItemUpload will do it
* | inventory messUbitUmarov2015-09-111-66/+219
| |
* | remove diva's inventory cache since it seems to cause mantis 7720, broken ↵UbitUmarov2015-09-111-219/+66
| | | | | | | | items UUID. Guess it doesn't cover all paths
* | revert SynchronousRestObjectRequester timeout to miliseconds, and fix where ↵UbitUmarov2015-09-091-2/+2
| | | | | | | | it was wrong set in seconds
* | Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-0812-12/+10
|\ \ | |/ | | | | | | | | | | | | 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
| * Deleted OpenSim.Framework.Communications. Moved its two remaining files to ↵Diva Canto2015-09-0412-12/+10
| | | | | | | | OpenSim.Framework.
* | at last we can login and see objects ( friends is dead and disable inUbitUmarov2015-09-031-1/+1
| | | | | | | | scenepresence)
* | seems to compile ( tests comented out)UbitUmarov2015-09-027-173/+8
| |
* | bad merge?UbitUmarov2015-09-0115-80/+576
|\ \ | |/ |/|
| * add more of the v03 checks and homeURL. Sending side only for nowUbitUmarov2015-08-261-2/+6
| |
| * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-291-4/+4
| | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
| * varregion: refactor use of 'double heightmap[,]' into references to new ↵Robert Adams2015-03-271-0/+10
| | | | | | | | | | | | class TerrainData and push the implementation from Scene into the database readers and writers.
| * dont give a ring to each asset request, just one to rule them all, i meanUbitUmarov2014-09-181-8/+15
| | | | | | | | thread not ring
| * and another oneUbitUmarov2014-09-171-1/+6
| |
| * Change the map tile system to be multi-grid hosting compatibleMelanie Thielker2014-08-231-3/+5
| |
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2124-708/+1065
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * Merge branch 'master' into careminsterMelanie2014-01-281-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ Intermediate commit. Sill errors.Melanie2014-01-051-1/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| | * \ \ Merge branch 'master' into careminsterMelanie2013-11-081-8/+11
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * \ \ \ Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| | * \ \ \ \ Merge branch 'avination-current' into careminsterMelanie2013-09-161-1/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| | * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-09-072-0/+57
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs