Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | change silly Monitor use | UbitUmarov | 2015-11-22 | 1 | -11/+11 |
| | |||||
* | change syncronization method | UbitUmarov | 2015-11-22 | 1 | -76/+65 |
| | |||||
* | revert take the Monitor.wait out of the locks | UbitUmarov | 2015-11-22 | 1 | -17/+16 |
| | |||||
* | coment out merge option on multiregion oar load i added | UbitUmarov | 2015-11-22 | 1 | -1/+1 |
| | |||||
* | take the Monitor.wait out of the locks | UbitUmarov | 2015-11-22 | 1 | -16/+17 |
| | |||||
* | a few more changes on Multiregion control file load | UbitUmarov | 2015-11-22 | 2 | -9/+19 |
| | |||||
* | add a a missing monitor.wait if still not needed, mb in future | UbitUmarov | 2015-11-22 | 1 | -3/+8 |
| | |||||
* | a few changes on Multiregion control file load ; load oar seems far from good | UbitUmarov | 2015-11-22 | 2 | -8/+15 |
| | |||||
* | add Monitor.wait on load | UbitUmarov | 2015-11-22 | 1 | -0/+4 |
| | |||||
* | reduce noise before compare | UbitUmarov | 2015-11-22 | 1 | -2/+13 |
| | |||||
* | add merge option on multioar test | UbitUmarov | 2015-11-22 | 1 | -1/+3 |
| | |||||
* | minor changes | UbitUmarov | 2015-11-22 | 1 | -14/+19 |
| | |||||
* | don't use 'funny' Quaternions | UbitUmarov | 2015-11-22 | 1 | -0/+2 |
| | |||||
* | Changes to Load Oar options and new code to support importing OARs with ↵ | Jak Daniels | 2015-11-22 | 3 | -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 Daniels | 2015-11-22 | 1 | -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 Daniels | 2015-11-22 | 1 | -16/+274 |
| | | | | | | Region sizes to the destination region. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt> | ||||
* | add a missing override | UbitUmarov | 2015-11-21 | 1 | -1/+1 |
| | |||||
* | remove some compile warnings increasing total number by 2 | UbitUmarov | 2015-11-21 | 1 | -2/+0 |
| | |||||
* | change a log message from error to just Debug | UbitUmarov | 2015-11-20 | 1 | -1/+1 |
| | |||||
* | remove unused return value on DeliverMessageTo() | UbitUmarov | 2015-11-20 | 1 | -9/+7 |
| | |||||
* | remove duplicate object chat messages ( mantis 7745 ),fix llRegionSay, this ↵ | UbitUmarov | 2015-11-20 | 1 | -0/+5 |
| | | | | are still merge issues | ||||
* | clean code a bit | UbitUmarov | 2015-11-19 | 1 | -13/+5 |
| | |||||
* | ClearPartAttachmentData before adding object to scene, not after | UbitUmarov | 2015-11-19 | 1 | -3/+3 |
| | |||||
* | cleanup indentation | UbitUmarov | 2015-11-18 | 1 | -70/+30 |
| | |||||
* | fix another variable number of wearable types issue | UbitUmarov | 2015-11-18 | 1 | -2/+5 |
| | |||||
* | remove unused parameter - missing file | UbitUmarov | 2015-11-17 | 1 | -5/+7 |
| | |||||
* | remove unused parameter | UbitUmarov | 2015-11-17 | 1 | -5/+5 |
| | |||||
* | work around some 'tests' errors: fix wrong parameters | UbitUmarov | 2015-11-17 | 1 | -5/+5 |
| | |||||
* | work around some 'tests' errors: sp attachments and appearance are not in sync | UbitUmarov | 2015-11-17 | 1 | -24/+24 |
| | |||||
* | work around some 'tests' errors: terrain effects limits changed | UbitUmarov | 2015-11-17 | 1 | -2/+2 |
| | |||||
* | work around some 'tests' errors: add a httpserver | UbitUmarov | 2015-11-17 | 1 | -3/+3 |
| | |||||
* | work around some 'tests' errors: allow sitTargetposition and orientation to ↵ | UbitUmarov | 2015-11-17 | 1 | -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 changed | UbitUmarov | 2015-11-17 | 1 | -0/+2 |
| | |||||
* | work around some 'tests' errors: test for null cacheItems | UbitUmarov | 2015-11-17 | 1 | -0/+3 |
| | |||||
* | bug fix: improve chat to child avatars. Still not good because of low ↵ | UbitUmarov | 2015-11-17 | 1 | -10/+11 |
| | | | | resolution of child position updates | ||||
* | deatach from backup on attachment | UbitUmarov | 2015-11-16 | 1 | -0/+2 |
| | |||||
* | coment out excessive debug messages | UbitUmarov | 2015-11-16 | 1 | -4/+5 |
| | |||||
* | fix silly bug | UbitUmarov | 2015-11-10 | 1 | -3/+3 |
| | |||||
* | start TerrainCheckUpdates on heartbeat thread, but do it async; fix a bug ↵ | UbitUmarov | 2015-11-10 | 1 | -18/+33 |
| | | | | on slow terrain send limits check | ||||
* | change OfflineMessageModule from new avination code to original master, for ↵ | UbitUmarov | 2015-11-06 | 1 | -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 Thielker | 2015-11-01 | 1 | -1/+7 |
|\ | | | | | | | avinationmerge | ||||
| * | Don't crash the sim if the map image is null. | Diva Canto | 2015-11-01 | 1 | -1/+7 |
| | | |||||
* | | More plumbing of the EntityTransferContext (not yet complete) | Melanie Thielker | 2015-11-01 | 5 | -28/+38 |
|/ | |||||
* | fix more merge issues | UbitUmarov | 2015-11-01 | 1 | -5/+5 |
| | |||||
* | fix merge issues | UbitUmarov | 2015-11-01 | 1 | -8/+9 |
| | |||||
* | Merge branch 'master' into avinationmerge | UbitUmarov | 2015-11-01 | 6 | -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 7735 | UbitUmarov | 2015-10-31 | 1 | -1/+1 |
| | | |||||
| * | fix internal support for non square regions | UbitUmarov | 2015-10-31 | 1 | -2/+3 |
| | | |||||
| * | Introduce an EntityTransferContext carrying the version numbers to pass | Melanie Thielker | 2015-10-31 | 3 | -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 no | Melanie Thielker | 2015-10-31 | 2 | -7/+3 |
| | | | | | | | | | | longer test TP v1 now. TP v1 will be removed within 6 months anyway. |