| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | 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 '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge | Melanie | 2011-10-25 | 3 | -8/+39 | |
| |\ \ | |/ | ||||||
| | * | More method doc and formatting changes. Makes DestroyOdeStructures() private | Justin Clark-Casey (justincc) | 2011-10-13 | 3 | -8/+39 | |
| | | | ||||||
| * | | Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge | Melanie | 2011-10-25 | 2 | -91/+79 | |
| |\ \ | |/ | ||||||
| | * | refactor: move 3x copy/pasted ode structure removal code in ODECharacter ↵ | Justin Clark-Casey (justincc) | 2011-10-13 | 2 | -91/+79 | |
| | | | | | | | | | | | | | into a DestroyOdeStructures() method also adds some method doc | |||||
| * | | 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 | |
| | | | ||||||
| * | | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge | Melanie | 2011-10-25 | 2 | -3/+1 | |
| |\ \ | |/ | ||||||
| | * | Get rid of some traces of the old pre-ROBUST grid architecture config | Justin Clark-Casey (justincc) | 2011-10-12 | 2 | -3/+1 | |
| | | | ||||||
| * | | Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge | Melanie | 2011-10-25 | 5 | -343/+282 | |
| |\ \ | |/ | ||||||
| | * | Bring LindenUDP.Tests back from the dead. No tests are running. | Justin Clark-Casey (justincc) | 2011-10-12 | 5 | -343/+282 | |
| | | | | | | | | | Code drift means that most of this stuff doesn't compile but the structure is still useful. | |||||
| * | | Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+2 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||||
| | * | When shutting down XEngine, log how many scripts are being shutdown so the ↵ | Justin Clark-Casey (justincc) | 2011-10-12 | 2 | -2/+5 | |
| | | | | | | | | | user knows why they are waiting. | |||||
| * | | Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge | Melanie | 2011-10-25 | 3 | -3/+12 | |
| |\ \ | |/ | ||||||
| | * | minor: insert some commented out log lines which are a blunt but useful ↵ | Justin Clark-Casey (justincc) | 2011-10-12 | 3 | -3/+12 | |
| | | | | | | | | | instrument to see packet expiry and received acks | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-12 | 1 | -1/+1 | |
| | |\ | ||||||
| * | \ | Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmerge | Melanie | 2011-10-25 | 3 | -17/+39 | |
| |\ \ \ | |/ / | ||||||
| | * | | Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollection | Justin Clark-Casey (justincc) | 2011-10-12 | 3 | -17/+39 | |
| | | | | ||||||
| * | | | 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 | |
| | | | | ||||||
| * | | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Change default groups messaging module in hardcode to the empty string. | Melanie | 2011-10-12 | 1 | -1/+1 | |
| | |/ | | | | | | | | | Modules should not assume thet they are the one and only, but only be enabled when explicitly configured. | |||||
| * | | 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 | 3 | -1/+43 | |
| |\ \ | |/ | ||||||
| | * | Start recording object updates per second statistic (analogue of agent ↵ | Justin Clark-Casey (justincc) | 2011-10-11 | 3 | -1/+43 | |
| | | | | | | | | | | | | | 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 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+1 | |
| |\ \ | |/ | ||||||
| | * | meaningless change to goose panda | Justin Clark-Casey (justincc) | 2011-10-11 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge | Melanie | 2011-10-12 | 2 | -21/+32 | |
| |\ \ | |/ | ||||||
| | * | osSetParcelDetails - PARCEL_DETAILS_CLAIMDATE | Pixel Tomsen | 2011-10-11 | 2 | -21/+32 | |
| | | | | | | | | | | | | | | | this new flag set parcels claim date value 0 for this flag set current unixstamp http://opensimulator.org/mantis/view.php?id=5725 | |||||
| * | | Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+3 | |
| |\ \ | |/ | ||||||
| | * | Allow monitoring of stats by region name | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -0/+3 | |
| | | | ||||||
| * | | Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmerge | Melanie | 2011-10-12 | 16 | -21/+326 | |
| |\ \ | |/ | ||||||
| | * | Add other region stats (total frame time, physics fps, etc.) currently ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 16 | -21/+326 | |
| | | | | | | | | | | | | | | | 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 | 3 | -15/+15 | |
| |\ \ | |/ | ||||||
| | * | Convert getLastReportedSimFPS() and getLastReportedSimStats() into more ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 3 | -15/+15 | |
| | | | | | | | | | idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter | |||||
| * | | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge | Melanie | 2011-10-12 | 1 | -15/+35 | |
| |\ \ | |/ | ||||||
| | * | Provide a way to turn the MonitorModule on and off | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -15/+35 | |
| | | | | | | | | | Default is currently on since this is the historical setting | |||||
| * | | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge | Melanie | 2011-10-12 | 3 | -15/+2 | |
| |\ \ | |/ | ||||||
| | * | refactor: have lsl and ossl interrogate scene.StatsReporter directly rather ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 3 | -15/+2 | |
| | | | | | | | | | | | | | 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 '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge | Melanie | 2011-10-12 | 1 | -6/+4 | |
| |\ \ | |/ | ||||||
| | * | remove unused LastAssetID from DynamicTextureUpdaer | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -6/+4 | |
| | | | ||||||
| * | | 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. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |