Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into avinationmerge | UbitUmarov | 2015-11-01 | 1 | -4/+6 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -4/+5 |
| | | | | | | | | | | to all interested functions. Should fix the varregion conditional. Still a testing version, do NOT use in production! | ||||
| * | Merge branch 'master' of opensimulator.org:/var/git/opensim | Melanie Thielker | 2015-10-31 | 1 | -6/+2 |
| |\ | |||||
| | * | fix mantis 7733, reverting setting of IsAttachment on first call to full ↵ | UbitUmarov | 2015-10-29 | 1 | -6/+2 |
| | | | | | | | | | | | | check. Replace instead same simple IsAttachment tests by full checks | ||||
| * | | Testing stage of the new versioning system. Use at own risk. May not | Melanie Thielker | 2015-10-31 | 1 | -1/+1 |
| |/ | | | | | | | work. Will eat your babies. Yada. Yada. | ||||
| * | set SOG.IsAttachment when doing a full check, so future gets see the right ↵ | UbitUmarov | 2015-10-25 | 1 | -1/+6 |
| | | | | | | | | value | ||||
* | | replace objects scale clamp by a more readable clamp. Simplify GroupResize ↵ | UbitUmarov | 2015-10-23 | 1 | -129/+74 |
| | | | | | | | | and let rescale factors < 1 also be checked for size limits, Set new scales directly not checking them again. | ||||
* | | stop using a Vector3 to store 3bits | UbitUmarov | 2015-10-20 | 1 | -12/+37 |
| | | |||||
* | | STATUS_ROTATE are linkset flags and not prim | UbitUmarov | 2015-10-20 | 1 | -11/+18 |
| | | |||||
* | | add high level code suport for SetHoverHeight() called from a attachment, ↵ | UbitUmarov | 2015-09-30 | 1 | -1/+9 |
| | | | | | | | | so in future physics engines can also suport it | ||||
* | | fix object crossings to other scene on same instance | UbitUmarov | 2015-09-26 | 1 | -1/+6 |
| | | |||||
* | | last merging of sog m_linkedAvatars into m_sittingAvatars - untested. | UbitUmarov | 2015-09-21 | 1 | -48/+5 |
| | | |||||
* | | Fix a regression to GetSittingAvatars(). Return List<ScenePresence> once more. | Kevin Cozens | 2015-09-21 | 1 | -4/+4 |
| | | |||||
* | | try to improve vehicles crossing with Xengine. Lag seems main issue now, ↵ | UbitUmarov | 2015-09-14 | 1 | -4/+16 |
| | | | | | | | | but needs testing, specially the fail cases, that most likelly need more work | ||||
* | | Merge of ubitworkvarnew with opensim/master as of 20150905. | Robert Adams | 2015-09-08 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | | | 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 | ||||
| * | More namespace and dll name changes. Still no functional changes. | Diva Canto | 2015-08-30 | 1 | -1/+1 |
| | | |||||
| * | Renamed the namespaces too | Diva Canto | 2015-08-30 | 1 | -1/+1 |
| | | |||||
* | | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 1 | -235/+7 |
| | | |||||
* | | bad merge? | UbitUmarov | 2015-09-01 | 1 | -270/+1433 |
|\ \ | |/ |/| | |||||
| * | funny bug | UbitUmarov | 2015-08-19 | 1 | -1/+1 |
| | | |||||
| * | varregion: any conversions of use of Constants.RegionSize converted into | Robert Adams | 2015-03-29 | 1 | -1/+1 |
| | | | | | | | | Util.cs routines to convert region coords to and from world coords or handles. | ||||
| * | Varregion: first cut at removing Border class checks for region crossings. | Robert Adams | 2015-03-22 | 1 | -6/+4 |
| | | | | | | | | | | Added Scene.PositionIsInCurrentRegion(pos) to sense when new position needs some crossing work. Many changes made to EntityTransferModule to accomodate new crossing sense logic. | ||||
| * | fix stopMoveToTarget in attachments case ( similar to core fix) | UbitUmarov | 2014-11-19 | 1 | -4/+15 |
| | | |||||
| * | BUG FIX prevent references to null scene (as happens on mesh uploads) | UbitUmarov | 2014-11-03 | 1 | -12/+15 |
| | | |||||
| * | remove debug message | UbitUmarov | 2014-10-26 | 1 | -7/+0 |
| | | |||||
| * | delete keyframes on temporary backup group | UbitUmarov | 2014-10-26 | 1 | -0/+8 |
| | | |||||
| * | Debug... ( restored TriggerOnSceneObjectPreSave) | UbitUmarov | 2014-10-26 | 1 | -12/+10 |
| | | |||||
| * | remove lock that did nothing, DEBUG disable TriggerOnSceneObjectPreSave | UbitUmarov | 2014-10-26 | 1 | -4/+3 |
| | | |||||
| * | another try to prevent double crossing | UbitUmarov | 2014-10-26 | 1 | -52/+46 |
| | | |||||
| * | keep intransit flag even if deleted, dont set sog position if in transit | UbitUmarov | 2014-10-26 | 1 | -41/+38 |
| | | |||||
| * | some cleanup, localID coerence fix.. | UbitUmarov | 2014-10-26 | 1 | -27/+7 |
| | | |||||
| * | don't backup in transit SOGs | UbitUmarov | 2014-10-24 | 1 | -1/+1 |
| | | |||||
| * | try to make SOG crossings full async. Simplify some borders checking.... | UbitUmarov | 2014-10-24 | 1 | -158/+199 |
| | | |||||
| * | some changes in link/unlink code, bypassing complex variables set methods | UbitUmarov | 2014-09-22 | 1 | -25/+25 |
| | | |||||
| * | a few more changes on link/unlink | UbitUmarov | 2014-09-22 | 1 | -3/+3 |
| | | |||||
| * | update scenegraph group find by part information in sog link, so script ↵ | UbitUmarov | 2014-09-22 | 1 | -3/+5 |
| | | | | | | | | link functions do update that also. | ||||
| * | dont send fullObjectUpdate on deselect | UbitUmarov | 2014-09-09 | 1 | -4/+4 |
| | | |||||
| * | limit number of prims on physical objects. Not all cases covered still | UbitUmarov | 2014-09-08 | 1 | -2/+44 |
| | | |||||
| * | some cleanup ( well or not ) | UbitUmarov | 2014-08-22 | 1 | -14/+4 |
| | | |||||
| * | add filter sog updates | UbitUmarov | 2014-08-21 | 1 | -0/+40 |
| | | |||||
| * | sitting avatars hidding by their position. This is not as SL that uses | UbitUmarov | 2014-08-01 | 1 | -0/+5 |
| | | | | | | | | | | | | avatar sitting on root prim. All cases have good and bad situations, this is simpler. Only SOG position changes triggers checks, rotation alone will not. ( as happens in other cases ) (UNTESTED, as usual ) | ||||
| * | change how sounds work. May be bad.. needs testing | UbitUmarov | 2014-07-27 | 1 | -2/+4 |
| | | |||||
| * | clear script controls on crossing (untested)(possible should be done | UbitUmarov | 2014-07-26 | 1 | -0/+1 |
| | | | | | | | | elsewhere/othe way) | ||||
| * | CrossPrimGroupIntoNewRegion does keyframes and physics crossing fails, so | UbitUmarov | 2014-07-22 | 1 | -91/+86 |
| | | | | | | | | revert previus change assuming it didnt. remove a no longer needed else {} | ||||
| * | consider that CrossPrimGroupIntoNewRegion removes DIE_AT_EDGE and | UbitUmarov | 2014-07-22 | 1 | -0/+2 |
| | | | | | | | | RETURN_AT_EDGE from simulation | ||||
| * | make ResetChildPrimPhysicsPositions only do what it is supposed to do and | UbitUmarov | 2014-07-22 | 1 | -1/+11 |
| | | | | | | | | not what AbsolutePosition does | ||||
| * | tell scripts about positions changes after they are actually changed | UbitUmarov | 2014-07-22 | 1 | -10/+18 |
| | | |||||
| * | dont try to cross with avatars on DIE_AT_EDGE or RETURN_AT_EDGE sog | UbitUmarov | 2014-07-22 | 1 | -84/+96 |
| | | |||||
| * | bug fix. Child position got broken because first prim i parts array may | UbitUmarov | 2014-07-22 | 1 | -0/+5 |
| | | | | | | | | not be the root prim | ||||
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 1 | -25/+24 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs |