| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+3 |
| |\ | |||||
| | * | Allow an avatar to be explicitly named to the "debug packet" command | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -2/+3 |
| | | | |||||
| * | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -1/+1 |
| | | | | | | | | | without a getter | ||||
| * | | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge | Melanie | 2011-10-25 | 2 | -12/+13 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | refactor: Use SOP.SitTargetAvatar instead of calling a special ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 2 | -10/+9 |
| | | | | | | | | | GetAvatarOnSitTarget() which returned exactly the same thing | ||||
| * | | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+8 |
| |\ \ | |/ | |||||
| | * | Implement osNpcStand(<npc-id>) | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -0/+8 |
| | | | | | | | | | Allows you to stand an NPC that has sat. | ||||
| * | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 4 | -15/+12 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 3 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE) e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE); At the moment, sit only succeeds if the part has a sit target set. NPC immediately sits on the target even if miles away - they do not walk up to it. This method is in development - it may change so please don't trust it yet. Standing will follow shortly since that's kind of important once you're sitting :) | ||||
| * | | Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
| |\ \ | |/ | |||||
| | * | improve method doc on Scene.OtherRegionUp() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+4 |
| | | | | | | | | | this is really just to trigger panda. | ||||
| * | | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+2 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -3/+2 |
| | | | | | | | | | the others | ||||
| * | | Merge | Melanie | 2011-10-25 | 2 | -3/+1 |
| | | | |||||
| * | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 2 | -35/+18 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | fetch physical_prim switch from [Startup] config from inside scene, as is ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -38/+17 |
| | | | | | | | | | done for most other scene config params | ||||
| * | | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge | Melanie | 2011-10-25 | 2 | -6/+6 |
| |\ \ | |/ | |||||
| | * | remove now redundant m_physical_prim flag from SOP.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -6/+6 |
| | | | |||||
| * | | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+6 |
| |\ \ | |/ | |||||
| | * | Restore [Startup] physical_prim flag which can stop any prims being subject ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | to physics This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed. Default for this flag is true as previously. | ||||
| * | | Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+0 |
| |\ \ | |/ | |||||
| | * | remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+0 |
| | | | | | | | | | done immediately afterwards in DoPhysicsPropertyUpdate() | ||||
| * | | Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmerge | Melanie | 2011-10-25 | 1 | -27/+21 |
| |\ \ | |/ | |||||
| | * | refactor: Remove redundant code in SOP.UpdatePrimFlags() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -27/+21 |
| | | | |||||
| * | | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge | Melanie | 2011-10-25 | 2 | -7/+18 |
| |\ \ | |/ | |||||
| | * | factor common code out into SOP.RemoveFromPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -7/+18 |
| | | | |||||
| * | | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 2 | -3/+3 |
| |\ \ | |/ | |||||
| | * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it ↵ | Justin Clark-Casey (justincc) | 2011-10-14 | 2 | -3/+3 |
| | | | | | | | | | sends entity updates (including presence ones), not just prims. | ||||
| * | | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge | Melanie | 2011-10-25 | 1 | -19/+33 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Expose minimum frame time and update periods for experimentation. | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -19/+33 |
| | | | | | | | | | | | | | | | Settings are at bottom of [Startup] in OpenSimDefaults.ini, override in OpenSim.ini to change Defaults are the same as previously. More information to come on opensim-dev shortly. Feel free to tweak but if you do please don't expect any support unless feedback on certain tweaks is explicitly requested. | ||||
| * | | Merge commit '128d8dfd8b355f84a71e2093e942937ca720c5c6' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
| |\ \ | |/ | |||||
| | * | refactor: Put the frame update period when temporary objects are cleaned up ↵ | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -4/+4 |
| | | | | | | | | | in a field, like all the other update periods | ||||
| * | | Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmerge | Melanie | 2011-10-25 | 1 | -29/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | refactor: chain the two scene constructors together to eliminate more copypasta | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -29/+1 |
| | | | |||||
| * | | Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmerge | Melanie | 2011-10-25 | 2 | -6/+13 |
| |\ \ | |/ | |||||
| | * | Tie reported FPS correction factor into the minimum frame time rather than ↵ | Justin Clark-Casey (justincc) | 2011-10-13 | 2 | -6/+13 |
| | | | | | | | | | | | | | setting separately. This makes reported FPS scale as required if min frame time changes | ||||
| * | | Merge commit 'ceb326284e49f0817fa0f848136ff60e6f66568f' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+12 |
| |\ \ | |/ | |||||
| | * | Move fps stat adjustment factor into field rather than hard-coded. | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -1/+12 |
| | | | |||||
| * | | Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge | Melanie | 2011-10-25 | 3 | -9/+1 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-10-12 | 3 | -44/+1 |
| | | | |||||
| * | | Fix ground sit autopilot | Melanie | 2011-10-25 | 2 | -9/+19 |
| | | | |||||
| * | | Fake an AgentCircuitData if none is available rather than crashing out | Melanie | 2011-10-24 | 1 | -2/+24 |
| | | | |||||
| * | | Allow updating the movement animation while flying. This fixes falling, | Melanie | 2011-10-21 | 1 | -20/+6 |
| | | | | | | | | | splatting and ground sit. Walking to a ground sit still doesn't work. | ||||
| * | | Fix up the animator and ScenePresence to like each other again | Melanie | 2011-10-20 | 2 | -7/+24 |
| | | | |||||
| * | | Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebroken | Melanie | 2011-10-12 | 1 | -12/+6 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 2 | -1/+35 |
| |\ \ | |/ | |||||
| | * | Start recording object updates per second statistic (analogue of agent ↵ | Justin Clark-Casey (justincc) | 2011-10-11 | 2 | -1/+35 |
| | | | | | | | | | | | | | updates per secod) and expose via monitoring module as ObjectUpdatePerSecondMonitor A useful diagnostic to find out how object updates are burdening a scene | ||||
| * | | Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Add other region stats (total frame time, physics fps, etc.) currently ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | missing from MonitorModule Unlike the other 3 stats mechanisms, monitor data can be queried per individual region, which makes this useful. This doesn't affect an of the existing monitored stats. | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |