Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | More EntityTransferContext plumbing | Melanie Thielker | 2015-11-01 | 3 | -19/+4 | |
| | ||||||
* | More plumbing of the EntityTransferContext (not yet complete) | Melanie Thielker | 2015-11-01 | 8 | -16/+21 | |
| | ||||||
* | Merge branch 'master' into avinationmerge | UbitUmarov | 2015-11-01 | 2 | -0/+4 | |
|\ | ||||||
| * | Plumb the special VeriableWearablesSuported field which we will | Melanie Thielker | 2015-11-01 | 2 | -0/+4 | |
| | | | | | | | | temporarily use to determine extended wearableness | |||||
* | | fix merge issues | UbitUmarov | 2015-11-01 | 1 | -1/+0 | |
| | | ||||||
* | | Merge branch 'master' into avinationmerge | UbitUmarov | 2015-11-01 | 6 | -23/+53 | |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pass | Melanie Thielker | 2015-10-31 | 4 | -12/+27 | |
| | | | | | | | | | | 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 in | Melanie Thielker | 2015-10-31 | 1 | -3/+5 | |
| | | | | | | | | transfers | |||||
| * | simplify new regions protocol version control. (May not work, and babies ↵ | UbitUmarov | 2015-10-31 | 1 | -2/+2 | |
| | | | | | | | | safety warnings still valid | |||||
| * | fix teleport to to string version regions | UbitUmarov | 2015-10-31 | 1 | -1/+1 | |
| | | ||||||
| * | Testing stage of the new versioning system. Use at own risk. May not | Melanie Thielker | 2015-10-31 | 4 | -15/+29 | |
| | | | | | | | | work. Will eat your babies. Yada. Yada. | |||||
| * | fix services handling of visualparameters, avoiding possible crashs (mantis ↵ | UbitUmarov | 2015-10-27 | 1 | -5/+20 | |
| | | | | | | | | 7732) partially appling code from avinationmerge | |||||
| * | Mark XAssetService obsolete and warn users. | Diva Canto | 2015-10-21 | 1 | -0/+2 | |
| | | ||||||
| * | On to 0.8.3! | Diva Canto | 2015-10-18 | 16 | -16/+16 | |
| | | ||||||
| * | Clean up of simulation version, the number that rules the compatibility of ↵ | Diva Canto | 2015-10-18 | 2 | -4/+5 | |
| | | | | | | | | | | | | | | | | 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. | |||||
| * | Mantis #7720: AssetXferUploader was setting AssetID to UUID.Zero. Before ↵ | Diva Canto | 2015-09-11 | 1 | -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. | |||||
* | | Mark XAssetService obsolete and warn users. | Diva Canto | 2015-10-21 | 1 | -0/+2 | |
| | | ||||||
* | | On to 0.8.3! | Diva Canto | 2015-10-18 | 16 | -16/+16 | |
| | | | | | | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | |||||
* | | Fixed merge conflicts | Diva Canto | 2015-10-18 | 2 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | Restored authentication in AssetServicesConnector. | Diva Canto | 2015-10-14 | 1 | -2/+2 | |
| | | ||||||
* | | ... merge issue | UbitUmarov | 2015-09-28 | 1 | -5/+3 | |
| | | ||||||
* | | clear merge issue | UbitUmarov | 2015-09-28 | 1 | -7/+1 | |
| | | ||||||
* | | coment out some debug, clean a bit | UbitUmarov | 2015-09-26 | 1 | -8/+0 | |
| | | ||||||
* | | fix bad side efects of missing avination optional configuration | UbitUmarov | 2015-09-15 | 1 | -11/+16 | |
| | | ||||||
* | | Remove the last proprietary copyright headers, insert BSD ones. | Melanie Thielker | 2015-09-13 | 1 | -6/+27 | |
| | | ||||||
* | | put back diva's cache with her recent fix but also avoid duplicated ↵ | UbitUmarov | 2015-09-11 | 1 | -1/+8 | |
| | | | | | | | | InventoryService.UpdateItem call in case of m_uploadState is complete. In that case CompleteItemUpload will do it | |||||
* | | inventory mess | UbitUmarov | 2015-09-11 | 1 | -66/+219 | |
| | | ||||||
* | | remove diva's inventory cache since it seems to cause mantis 7720, broken ↵ | UbitUmarov | 2015-09-11 | 1 | -219/+66 | |
| | | | | | | | | items UUID. Guess it doesn't cover all paths | |||||
* | | revert SynchronousRestObjectRequester timeout to miliseconds, and fix where ↵ | UbitUmarov | 2015-09-09 | 1 | -2/+2 | |
| | | | | | | | | it was wrong set in seconds | |||||
* | | Merge of ubitworkvarnew with opensim/master as of 20150905. | Robert Adams | 2015-09-08 | 14 | -16/+21 | |
|\ \ | |/ | | | | | | | | | | | | | 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 | |||||
| * | Clean up viewer-based access control specifications. | Diva Canto | 2015-09-06 | 2 | -4/+11 | |
| | | ||||||
| * | Deleted OpenSim.Framework.Communications. Moved its two remaining files to ↵ | Diva Canto | 2015-09-04 | 12 | -12/+10 | |
| | | | | | | | | OpenSim.Framework. | |||||
* | | at last we can login and see objects ( friends is dead and disable in | UbitUmarov | 2015-09-03 | 1 | -1/+1 | |
| | | | | | | | | scenepresence) | |||||
* | | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 19 | -473/+48 | |
| | | ||||||
* | | bad merge? | UbitUmarov | 2015-09-01 | 40 | -157/+1160 | |
|\ \ | |/ |/| | ||||||
| * | cache in memory water texture | UbitUmarov | 2015-08-30 | 1 | -33/+105 | |
| | | ||||||
| * | review ServiceBase for var | UbitUmarov | 2015-08-28 | 1 | -2/+5 | |
| | | ||||||
| * | review llLoginService for var support | UbitUmarov | 2015-08-28 | 1 | -8/+1 | |
| | | ||||||
| * | review gridservice module. Not merged os code for varsize, since that | UbitUmarov | 2015-08-28 | 1 | -0/+68 | |
| | | | | | | | | should be handle at db level | |||||
| * | add more of the v03 checks and homeURL. Sending side only for now | UbitUmarov | 2015-08-26 | 2 | -3/+19 | |
| | | ||||||
| * | varregion: any conversions of use of Constants.RegionSize converted into | Robert Adams | 2015-03-29 | 6 | -45/+63 | |
| | | | | | | | | 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 Adams | 2015-03-27 | 1 | -0/+10 | |
| | | | | | | | | | | | | class TerrainData and push the implementation from Scene into the database readers and writers. | |||||
| * | bug fix | UbitUmarov | 2014-10-26 | 1 | -1/+1 | |
| | | ||||||
| * | TEST**** wingridproxy detection at grid login. Untested possible not | UbitUmarov | 2014-10-24 | 2 | -5/+8 | |
| | | | | | | | | | | very reliable. Adds some load even on region servers because of code at BaseHttpServer. | |||||
| * | dont give a ring to each asset request, just one to rule them all, i mean | UbitUmarov | 2014-09-18 | 1 | -8/+15 | |
| | | | | | | | | thread not ring | |||||
| * | and another one | UbitUmarov | 2014-09-17 | 1 | -1/+6 | |
| | | ||||||
| * | Merge branch 'avination-current' | Melanie Thielker | 2014-08-23 | 1 | -0/+6 | |
| |\ | ||||||
| | * | Fix a null ref that will cause an exception if a grid region doesnt' specify ↵ | Melanie Thielker | 2014-08-23 | 1 | -0/+6 | |
| | | | | | | | | | | | | a URI. | |||||
| | * | Change the map tile system to be multi-grid hosting compatible | Melanie Thielker | 2014-08-23 | 3 | -24/+29 | |
| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs | |||||
| * | | Change the map tile system to be multi-grid hosting compatible | Melanie Thielker | 2014-08-23 | 3 | -24/+29 | |
| | | |