aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-014-14/+22
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-312-7/+8
| | | | | | | | | | 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-311-1/+5
| | | | | | | | | | longer test TP v1 now. TP v1 will be removed within 6 months anyway.
| * let silly tests override version on local connectionsUbitUmarov2015-10-311-2/+2
| |
| * Merge branch 'master' of opensimulator.org:/var/git/opensimMelanie Thielker2015-10-312-9/+6
| |\
| | * fix mantis 7733, reverting setting of IsAttachment on first call to full ↵UbitUmarov2015-10-292-9/+6
| | | | | | | | | | | | check. Replace instead same simple IsAttachment tests by full checks
| * | Testing stage of the new versioning system. Use at own risk. May notMelanie Thielker2015-10-312-4/+4
| |/ | | | | | | work. Will eat your babies. Yada. Yada.
| * set SOG.IsAttachment when doing a full check, so future gets see the right ↵UbitUmarov2015-10-251-1/+6
| | | | | | | | value
| * On to 0.8.3!Diva Canto2015-10-181-1/+1
| |
* | friends rights to edit objects display on viewers fixed. This needs to be ↵UbitUmarov2015-10-271-5/+9
| | | | | | | | optimized in future
* | replace objects scale clamp by a more readable clamp. Simplify GroupResize ↵UbitUmarov2015-10-232-139/+83
| | | | | | | | and let rescale factors < 1 also be checked for size limits, Set new scales directly not checking them again.
* | Make physics engines finish internal representation of loaded prims before ↵UbitUmarov2015-10-222-2/+8
| | | | | | | | starting simulation so it does start for all at same time. Currently only in use by ubOde
* | recover scripts execution time stat i lost on previus changes. Behing ↵UbitUmarov2015-10-212-5/+10
| | | | | | | | async, this will not add with other time stats giving total frame time, as happens on other simulators. But its a good diag stat.
* | move ugly convertion of axis locks 3 bit flags to a wasted vector3 down to ↵UbitUmarov2015-10-201-20/+2
| | | | | | | | PhysicsActor. Let engines use LockAngularMotion with either Vector3 argument or byte
* | add axis locks to sop serializer. Now they are also saved to inventoryUbitUmarov2015-10-201-0/+8
| |
* | also apply axis locks, when creating a prim physics actorUbitUmarov2015-10-201-0/+14
| |
* | stop using a Vector3 to store 3bitsUbitUmarov2015-10-202-22/+57
| |
* | STATUS_ROTATE are linkset flags and not primUbitUmarov2015-10-202-18/+20
| |
* | On to 0.8.3!Diva Canto2015-10-181-1/+1
| | | | | | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* | in stats use real integration time, not the wanted one. Dont let stats ↵UbitUmarov2015-10-121-20/+29
| | | | | | | | calls overlap using a proper lock object
* | remove unused method parameter master also removedUbitUmarov2015-10-021-1/+1
| |
* | send DisableSimulator messages on closing childagents. Possible still not ↵UbitUmarov2015-10-011-0/+9
| | | | | | | | on at best timming, or on the right source files
* | change GetNewRezLocation physics ray results processingUbitUmarov2015-10-011-21/+38
| |
* | let hoverheight rest position be a falling stateUbitUmarov2015-09-302-2/+12
| |
* | add high level code suport for SetHoverHeight() called from a attachment, ↵UbitUmarov2015-09-301-1/+9
| | | | | | | | so in future physics engines can also suport it
* | let sp know about scene before anything else on creationUbitUmarov2015-09-301-1/+1
| |
* | clamp all draw distance changes within region limitsUbitUmarov2015-09-301-8/+14
| |
* | add several options for NPC creation so abusive use can be reduced ↵UbitUmarov2015-09-301-0/+12
| | | | | | | | (restrictive by default) UNTESTED
* | let us see our online friendsUbitUmarov2015-09-281-6/+6
| |
* | remove a auxiliar vector no longer neededUbitUmarov2015-09-281-7/+5
| |
* | recover a lost position check for mega regionsUbitUmarov2015-09-281-6/+7
| |
* | fix unscripted sits without physics helpUbitUmarov2015-09-261-9/+4
| |
* | fix object rez on terrain, i broke adding physics assistanceUbitUmarov2015-09-261-11/+19
| |
* | fix object crossings to other scene on same instanceUbitUmarov2015-09-262-1/+8
| |
* | rearrange source codeUbitUmarov2015-09-251-313/+304
| |
* | add butterflies to terrainUbitUmarov2015-09-251-185/+757
| |
* | we still don't have extended wind and cloud neither do viewersUbitUmarov2015-09-241-40/+32
| |
* | some cleanup on terrain encoderUbitUmarov2015-09-241-178/+55
| |
* | save a few more bits per flat patchUbitUmarov2015-09-241-4/+5
| |
* | don't mess ray direction..UbitUmarov2015-09-241-74/+78
| |
* | add physics assistance on placement of a new object. This may help on ↵UbitUmarov2015-09-241-61/+101
| | | | | | | | mantis 7727, but may still need more work
* | fix the DC term on flat patch encodingUbitUmarov2015-09-231-3/+3
| |
* | speedup flat terrain patchs encoding, plus a few minor changes.UbitUmarov2015-09-231-173/+62
| |
* | change the encapsulation of compressed land patchs in llUDP packetsUbitUmarov2015-09-231-6/+61
| |
* | last merging of sog m_linkedAvatars into m_sittingAvatars - untested.UbitUmarov2015-09-212-49/+6
| |
* | try to remove Scenepresence dependence on sog m_linkedAvatars, sitting may ↵UbitUmarov2015-09-212-14/+6
| | | | | | | | still work
* | add missing sit checkUbitUmarov2015-09-211-1/+2
| |
* | Fix a regression to GetSittingAvatars(). Return List<ScenePresence> once more.Kevin Cozens2015-09-215-30/+28
| |
* | MapBlockFromGridRegion and Map2BlockFromGridRegion are the same thingUbitUmarov2015-09-181-1/+0
| |
* | avoid a null ref (that should not happen after last commit), also reduce use ↵UbitUmarov2015-09-151-20/+28
| | | | | | | | of thread jobs, where one is good enought
generated by cgit v1.1 at 2025-01-08 06:36:10 +0000