Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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. | |||||
* | | Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge | Melanie | 2011-10-12 | 1 | -13/+13 | |
|\ \ | |/ | ||||||
| * | Convert getLastReportedSimFPS() and getLastReportedSimStats() into more ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -13/+13 | |
| | | | | | | | | idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter | |||||
* | | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge | Melanie | 2011-10-12 | 1 | -13/+0 | |
|\ \ | |/ | ||||||
| * | refactor: have lsl and ossl interrogate scene.StatsReporter directly rather ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -13/+0 | |
| | | | | | | | | | | | | than going through scene I know this goes against the law of demeter but I don't think it's that useful here and I'd rather get rid of nasty little wrapper methods | |||||
* | | Merge commit 'ff80113534182bbcbcb49a73035776134fb04e3e' into bigmerge | Melanie | 2011-10-12 | 1 | -2/+6 | |
|\ \ | |/ | ||||||
| * | Go back to lying that sim fps is 55 when it's actually locked at a maximum ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | of 11. We're been lying since 2008 so I'm sure another few years can't hurt. To know the real fps, either divide sim fps by 5 and/or look at the frame time. | |||||
* | | Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log message | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 | |
| | | | | | | | | As per earlier discussions with dslake | |||||
* | | Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge | Melanie | 2011-10-12 | 3 | -51/+51 | |
|\ \ | |/ | ||||||
| * | Fixed line endings from previous commit | Dan Lake | 2011-10-06 | 3 | -51/+51 | |
| | | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-06 | 1 | -9/+2 | |
| |\ | ||||||
* | \ | Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge | Melanie | 2011-10-12 | 4 | -88/+78 | |
|\ \ \ | |/ / | ||||||
| * | | Refactored "known child region" in ScenePresence. There were 4 different | Dan Lake | 2011-10-06 | 4 | -88/+78 | |
| | | | | | | | | | | | | | | | | | | ways to access the list/dictionary of child regions and locking was inconsistent. There are now public properties which enforce locks. Callers are no longer required to create new copies of lists. | |||||
* | | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge | Melanie | 2011-10-12 | 1 | -9/+2 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | remove the pointless slashes on the end of the (5!) different server stat ↵ | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -9/+2 | |
| |/ | | | | | | | | | | | | | retrieval mechanisms. Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/ Can't do this with webstats yet since it does insane things to the path. | |||||
* | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge | Melanie | 2011-10-12 | 1 | -11/+10 | |
|\ \ | |/ | ||||||
| * | Simplified IsInTransit property on ScenePresence and removed InTransit() ↵ | Dan Lake | 2011-10-06 | 1 | -11/+10 | |
| | | | | | | | | which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit(). |