aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-012-4/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Testing stage of the new versioning system. Use at own risk. May notMelanie Thielker2015-10-312-5/+10
| | | | | | | | work. Will eat your babies. Yada. Yada.
| * On to 0.8.3!Diva Canto2015-10-185-5/+5
| |
| * Clean up of simulation version, the number that rules the compatibility of ↵Diva Canto2015-10-182-11/+21
| | | | | | | | | | | | | | | | 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.
| * Make regions tolerant to newer regions with more werables.Melanie Thielker2015-09-142-3/+6
| | | | | | | | Also, bump the interface version to 8
* | fix cut points of UTF-8 stringsUbitUmarov2015-10-281-10/+28
| |
* | add basic SendFindAgent() to lludp. Future use may require a list of pairs ↵UbitUmarov2015-10-261-0/+2
| | | | | | | | (X,Y). For now one pair is good enough.
* | On to 0.8.3!Diva Canto2015-10-185-5/+5
| | | | | | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* | Fixed merge conflictsDiva Canto2015-10-182-11/+21
| | | | | | | | | | | | | | | | | | | | 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
* | change version stringUbitUmarov2015-09-281-2/+2
| |
* | add missing SendAgentGroupDataUpdate to llClientViewUbitUmarov2015-09-271-0/+1
| |
* | change console main help to match masterUbitUmarov2015-09-241-13/+8
| |
* | dont let http keepalive and context reuse be trueUbitUmarov2015-09-232-3/+16
| |
* | remove duplicated and breaking codeUbitUmarov2015-09-211-3/+0
| |
* | temporary reduce maxwearables, so teleport testing can be performed before ↵UbitUmarov2015-09-151-3/+3
| | | | | | | | other regions get updated
* | Bump Interface Version to 8Melanie Thielker2015-09-141-1/+1
| |
* | Remove the last proprietary copyright headers, insert BSD ones.Melanie Thielker2015-09-132-2/+2
| |
* | remove a avn thing before it gets into coreUbitUmarov2015-09-101-11/+0
| |
* | revert SynchronousRestObjectRequester timeout to miliseconds, and fix where ↵UbitUmarov2015-09-091-1/+1
| | | | | | | | it was wrong set in seconds
* | Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-0823-1670/+338
|\ \ | |/ | | | | | | | | | | | | 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
| * Amend to previous commit: delete the corresponding AssemblyInfo'sDiva Canto2015-09-052-66/+0
| |
| * Moved the two region loaders into the RegionLoaderPlugin dll, therefore ↵Diva Canto2015-09-053-300/+0
| | | | | | | | eliminating 2 top-level dlls that didn't make much sense.
| * Deleted unused file.Diva Canto2015-09-051-77/+0
| |
| * Deleted OpenSim.Framework.Communications. Moved its two remaining files to ↵Diva Canto2015-09-043-68/+3
| | | | | | | | OpenSim.Framework.
| * Deleted old unfinished code under Framework.Communications that wasn't being ↵Diva Canto2015-09-0413-1007/+154
| | | | | | | | | | | | used anywhere. Also folded GenericAsyncResult into RestClient, since it is used only there. This is preparation to remove Framework.Communications entirely.
| * Deleted unused interfaceDiva Canto2015-09-041-157/+0
| |
| * All physics plugins are now region modules. Compiles but doesn't run.Diva Canto2015-08-311-0/+181
| |
* | let extra stats travel side by side with viewers ones... try to fix damm ↵UbitUmarov2015-09-062-12/+30
| | | | | | | | array indexes all over the place
* | fix modifing m_threads on a foreach scanning itUbitUmarov2015-09-051-1/+3
| |
* | add a GetTimeStampMS method, this returns a time stamp in miliSeconds with ↵UbitUmarov2015-09-041-0/+11
| | | | | | | | the resolution avaiable for StopWatchs. Value in double since it can be large (as machine uptime in high resolution ticks)
* | missing fileUbitUmarov2015-09-031-0/+530
| |
* | at last we can login and see objects ( friends is dead and disable inUbitUmarov2015-09-036-73/+21
| | | | | | | | scenepresence)
* | seems to compile ( tests comented out)UbitUmarov2015-09-0216-537/+151
| |
* | bad merge?UbitUmarov2015-09-0152-334/+2809
|\ \ | |/ |/|
| * more on tps and crossingsUbitUmarov2015-08-301-7/+16
| |
| * minor clear. Use isTainted in is read clear formUbitUmarov2015-08-271-9/+8
| |
| * remove rest of ushort test codeUbitUmarov2015-08-251-94/+31
| |
| * change terrain internal representation to float. ushort work with legalUbitUmarov2015-08-251-79/+162
| | | | | | | | | | sl terrain, but may break existent terrain and that may cost a lot more than the cost of memory
| * terrain stored as ushorts with gzip compressionUbitUmarov2015-08-251-30/+221
| |
| * change internal representation of terrain from int to ushort. This willUbitUmarov2015-08-241-19/+19
| | | | | | | | | | suporte height from 0 to 655.53m that includes SL limits ( still need to add code to trap eventual negative values from dbs or user input)
| * delay terrain sending if land queue is 2 busyUbitUmarov2015-08-221-0/+2
| |
| * Merge branch 'mbworkvar2' into ubitvarUbitUmarov2015-08-194-9/+517
| |\
| | * varregion: add varregion and TerrainData use in LLClientView.Robert Adams2015-03-281-0/+18
| | | | | | | | | | | | | | | Add sending multiple parcel patches and sending patches by avatar view distance.
| | * varregion: remove use of Constants.RegionSize is various places.Robert Adams2015-03-282-4/+9
| | | | | | | | | | | | More use of the Util routines for conversion of region handles into addresses.
| | * varregion: refactor use of 'double heightmap[,]' into references to new ↵Robert Adams2015-03-271-0/+464
| | | | | | | | | | | | | | | | | | class TerrainData and push the implementation from Scene into the database readers and writers.
| | * Varregion: first cut at removing Border class checks for region crossings.Robert Adams2015-03-221-5/+26
| | | | | | | | | | | | | | | Added Scene.PositionIsInCurrentRegion(pos) to sense when new position needs some crossing work. Many changes made to EntityTransferModule to accomodate new crossing sense logic.
| * | change pollService stop() to send 503 error and no keepalive. ( untested )UbitUmarov2015-08-182-6/+32
| | |
| * | do keepalive on mesh and texture GET. Dont use reusecontext any where.UbitUmarov2015-08-181-1/+1
| | | | | | | | | | | | | | | | | | setting of keepalive is wrong, it should follow the requested one ( or always as http1.1) only deny if needed (errors). KeepAlive may increase stress on number of avaiable file descritors.
| * | try to serialize http requests from same connection, so they are processedUbitUmarov2015-08-182-0/+84
| | | | | | | | | | | | in order. ( next commits will be about necessary keepAlive changes needed)
| * | Track selected objects per clientMelanie Thielker2015-08-151-0/+2
| |/
generated by cgit v1.1 at 2024-11-16 23:56:35 +0000