aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* change silly Monitor useUbitUmarov2015-11-221-11/+11
|
* change syncronization methodUbitUmarov2015-11-221-76/+65
|
* revert take the Monitor.wait out of the locksUbitUmarov2015-11-221-17/+16
|
* coment out merge option on multiregion oar load i addedUbitUmarov2015-11-221-1/+1
|
* take the Monitor.wait out of the locksUbitUmarov2015-11-221-16/+17
|
* a few more changes on Multiregion control file loadUbitUmarov2015-11-222-9/+19
|
* add a a missing monitor.wait if still not needed, mb in futureUbitUmarov2015-11-221-3/+8
|
* a few changes on Multiregion control file load ; load oar seems far from goodUbitUmarov2015-11-222-8/+15
|
* add Monitor.wait on loadUbitUmarov2015-11-221-0/+4
|
* reduce noise before compareUbitUmarov2015-11-221-2/+13
|
* add merge option on multioar testUbitUmarov2015-11-221-1/+3
|
* minor changesUbitUmarov2015-11-221-14/+19
|
* don't use 'funny' QuaternionsUbitUmarov2015-11-221-0/+2
|
* Changes to Load Oar options and new code to support importing OARs with ↵Jak Daniels2015-11-223-48/+262
| | | | | | different Region sizes to the destination region. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* Changes to TerrainModule/ITerrainModule to support importing OARs with ↵Jak Daniels2015-11-221-0/+31
| | | | | | different Region sizes to the destination region. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* Changes to LandObject/ILandObject to support importing OARs with different ↵Jak Daniels2015-11-221-16/+274
| | | | | | Region sizes to the destination region. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* add a missing overrideUbitUmarov2015-11-211-1/+1
|
* remove some compile warnings increasing total number by 2UbitUmarov2015-11-211-2/+0
|
* change a log message from error to just DebugUbitUmarov2015-11-201-1/+1
|
* remove unused return value on DeliverMessageTo()UbitUmarov2015-11-201-9/+7
|
* remove duplicate object chat messages ( mantis 7745 ),fix llRegionSay, this ↵UbitUmarov2015-11-201-0/+5
| | | | are still merge issues
* clean code a bitUbitUmarov2015-11-191-13/+5
|
* ClearPartAttachmentData before adding object to scene, not afterUbitUmarov2015-11-191-3/+3
|
* cleanup indentationUbitUmarov2015-11-181-70/+30
|
* fix another variable number of wearable types issueUbitUmarov2015-11-181-2/+5
|
* remove unused parameter - missing fileUbitUmarov2015-11-171-5/+7
|
* remove unused parameterUbitUmarov2015-11-171-5/+5
|
* work around some 'tests' errors: fix wrong parametersUbitUmarov2015-11-171-5/+5
|
* work around some 'tests' errors: sp attachments and appearance are not in syncUbitUmarov2015-11-171-24/+24
|
* work around some 'tests' errors: terrain effects limits changedUbitUmarov2015-11-171-2/+2
|
* work around some 'tests' errors: add a httpserverUbitUmarov2015-11-171-3/+3
|
* work around some 'tests' errors: allow sitTargetposition and orientation to ↵UbitUmarov2015-11-171-1/+2
| | | | be read from OAR on opensim, they are reset at avination, this may cause issues with old sits
* work around some 'tests' errors: Coalesced objects handling has changedUbitUmarov2015-11-171-0/+2
|
* work around some 'tests' errors: test for null cacheItemsUbitUmarov2015-11-171-0/+3
|
* bug fix: improve chat to child avatars. Still not good because of low ↵UbitUmarov2015-11-171-10/+11
| | | | resolution of child position updates
* deatach from backup on attachmentUbitUmarov2015-11-161-0/+2
|
* coment out excessive debug messagesUbitUmarov2015-11-161-4/+5
|
* fix silly bugUbitUmarov2015-11-101-3/+3
|
* start TerrainCheckUpdates on heartbeat thread, but do it async; fix a bug ↵UbitUmarov2015-11-101-18/+33
| | | | on slow terrain send limits check
* change OfflineMessageModule from new avination code to original master, for ↵UbitUmarov2015-11-061-4/+20
| | | | compatibility with current web servers php scripts. This may change after current test phase
* Merge branch 'avinationmerge' of opensimulator.org:/var/git/opensim into ↵Melanie Thielker2015-11-011-1/+7
|\ | | | | | | avinationmerge
| * Don't crash the sim if the map image is null.Diva Canto2015-11-011-1/+7
| |
* | More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-015-28/+38
|/
* fix more merge issuesUbitUmarov2015-11-011-5/+5
|
* fix merge issuesUbitUmarov2015-11-011-8/+9
|
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-016-72/+51
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * fix typo reported on mantis 7735UbitUmarov2015-10-311-1/+1
| |
| * fix internal support for non square regionsUbitUmarov2015-10-311-2/+3
| |
| * Introduce an EntityTransferContext carrying the version numbers to passMelanie Thielker2015-10-313-26/+29
| | | | | | | | | | to all interested functions. Should fix the varregion conditional. Still a testing version, do NOT use in production!
| * Remove testing cruft that is blocking the new protocols. Unit tests noMelanie Thielker2015-10-312-7/+3
| | | | | | | | | | longer test TP v1 now. TP v1 will be removed within 6 months anyway.