Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add some default size setting and checks | UbitUmarov | 2012-12-07 | 1 | -1/+2 |
| | |||||
* | revert the use of avatar skeleton and use avatar size provided by viewers, | UbitUmarov | 2012-12-07 | 1 | -2/+2 |
| | | | | since at least for now seems good enought | ||||
* | create a new ode character also with the new information | UbitUmarov | 2012-12-07 | 1 | -0/+6 |
| | |||||
* | *TEST* Use new avatar size in ubitODE. | UbitUmarov | 2012-12-07 | 1 | -0/+6 |
| | |||||
* | avatar collision plane send to viewer is only relative to feet. change | UbitUmarov | 2012-12-05 | 1 | -4/+11 |
| | | | | avatar collider, just rounding the boxes, etc | ||||
* | *TEST* diferent avatar collider | UbitUmarov | 2012-12-03 | 1 | -2/+13 |
| | |||||
* | Merge branch 'master' into careminster | Melanie | 2012-11-20 | 1 | -3/+20 |
|\ | |||||
| * | Minor formatting for 0962a35d and a few one-line comments as to why that ↵ | Justin Clark-Casey (justincc) | 2012-11-20 | 1 | -8/+7 |
| | | | | | | | | code is there | ||||
| * | Fix movetotarget on mega regions. | Iain Oliver | 2012-11-20 | 1 | -3/+21 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 1 | -0/+5 |
|\ \ | |||||
| * | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵ | teravus | 2012-11-04 | 1 | -0/+5 |
| | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-03 | 1 | -3/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Change to earlier commit for TargetVelocity to support distributed physics. | Dan Lake | 2012-11-02 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵ | Dan Lake | 2012-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | No change to existing functions. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-31 | 1 | -1/+4 |
|\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | Store and send the current movement animation state to a new sim on crossing | Melanie | 2012-10-30 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-30 | 1 | -1/+2 |
|\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | Add "force gc" region console command which manually invokes garbage collection. | Justin Clark-Casey (justincc) | 2012-10-29 | 1 | -1/+2 |
| | | | | | | | | | | | | For debugging purposes. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 1 | -7/+7 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | ||||
| * | | Changed "course" to "coarse" in several places | Oren Hurvitz | 2012-10-25 | 1 | -7/+7 |
| | | | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 1 | -3/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | remove fireandforget call to EnableChildAgents at end on CompleteMovement, | UbitUmarov | 2012-09-07 | 1 | -1/+3 |
| | | | | | | | | | | | | since this is already on own thread and its at the end of it. | ||||
| * | | Make friend notifies and closing child agents async because both can | Melanie | 2012-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive | ||||
| * | | a forgotten file plus minor changes. Imp and SL viewer seem to preserve | UbitUmarov | 2012-09-04 | 1 | -1/+2 |
| | | | | | | | | | | | | flight. FS 4.2.2 does not. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-07 | 1 | -5/+8 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs | ||||
| * | | formatting | SignpostMarv | 2012-09-04 | 1 | -6/+6 |
| | | | |||||
| * | | although the attachmentPoint argument is a uint, zero is not a valid ↵ | SignpostMarv | 2012-09-04 | 1 | -1/+4 |
| | | | | | | | | | | | | attachment point | ||||
* | | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster | Melanie | 2012-08-25 | 1 | -1/+3 |
|\ \ \ | |/ / | |||||
| * | | Extend "Restarting scripts in attachments" debug log message to show actual ↵ | Justin Clark-Casey (justincc) | 2012-08-24 | 1 | -1/+3 |
| | | | | | | | | | | | | name of user and the region they are in | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 1 | -5/+10 |
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | BulletSim: Properly regenerate hulls when objects made physical. | Robert Adams | 2012-08-17 | 1 | -8/+8 |
| | | | | | | | | | | This fixes the problem of non-base shapes (cubes and spheres) falling through the terrain. | ||||
| * | Modify order of code so SOP doesn't set the physics actor flying | Robert Adams | 2012-08-17 | 1 | -7/+12 |
| | | | | | | | | | | | | property multiple times every time Update is called. This eliminates zillions of settings which is better for BulletSim. The should be no functionality change. | ||||
* | | on presence close(), release animator and OnRegionHeartbeatEnd event | UbitUmarov | 2012-08-03 | 1 | -0/+7 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-08-01 | 1 | -1/+3 |
|\ \ | |||||
| * | | Correct StandUp position and rotation | Melanie | 2012-07-30 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-07-29 | 1 | -0/+3 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | See that if controls are taken, those are released before taking new ones | Melanie | 2012-07-29 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-20 | 1 | -13/+14 |
|\ \ \ | |/ / |/| / | |/ | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Stop explicitly closing and nulling out Animator in order to prevent NREs in ↵ | Justin Clark-Casey (justincc) | 2012-07-19 | 1 | -16/+6 |
| | | | | | | | | | | | | | | various places due to race conditions. Even where checks are being made they aren't enough since they all assume that the Animator they just checked is still there in the next line, which is not necessarily the case without locking. The memory used is small and these should be GC'd anyway when the SP is released. If this is not happening then the wider problem of old SPs being retained needs to be resolved. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 1 | -42/+32 |
|\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | If a part has a sit target and an avatar is already sitting, allow another ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -7/+4 |
| | | | | | | | | | | | | | | avatar to sit in the position given if no sit target was set. Previous behave was that the second avatar could not sit. This matches behaviour observed on the LL grid. | ||||
| * | refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -5/+0 |
| | | | | | | | | and SOP.RemoveSittingAvatar() | ||||
| * | Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability" | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -2/+2 |
| | | | | | | | | | | This reverts commit c8f0d476d2f775ba4d7afca12eeff527b46bb8e2. On reconsideration, I think this is less readable since immediately following code still sets SitTargetAvatar directly | ||||
| * | refactor: Add SOP.IsSitTargetOccupied to improve readability | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -2/+2 |
| | | |||||
| * | refactor: use sit orientation argument passed in to SP.SendSitResponse() ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -4/+2 |
| | | | | | | | | | | | | rather than creating a new copy There are no issues with side-effects since this is a struct. | ||||
| * | Move common code to detect whether a part has a valid sit target into a SOP ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -30/+5 |
| | | | | | | | | | | | | | | property rather than being repeated in SP. This also makes the detection in SP.FindNextAvailableSitTarget() and SendSitResponse() identical. Previously they varied slightly (SendSitResponse didn't check for an older type of invalid quaternion) but the practical effect is most probably zero. | ||||
| * | Remove log line accidentally left in SP.SendSitResponse() | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -1/+1 |
| | | |||||
| * | Don't allow a prim to be sat upon if its part of an attachment | Justin Clark-Casey (justincc) | 2012-07-09 | 1 | -0/+9 |
| | |