aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmergeMelanie2011-10-253-11/+19
|\
| * factor common code out into SOP.RemoveFromPhysics()Justin Clark-Casey (justincc)2011-10-153-11/+19
| |
* | Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmergeMelanie2011-10-252-53/+36
|\ \ | |/
| * reduce access to ODECharacter methods to make code analysis easier. ↵Justin Clark-Casey (justincc)2011-10-152-54/+36
| | | | | | | | Eliminate redundant argument on ProcessTaints()
* | Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmergeMelanie2011-10-251-19/+17
|\ \ | |/
| * restrict unnecessary access levels on ODEPrim fields/propertiesJustin Clark-Casey (justincc)2011-10-151-19/+17
| |
* | Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmergeMelanie2011-10-253-129/+195
|\ \ | |/
| * refactor: make methods that do not need to be public in ODE private or ↵Justin Clark-Casey (justincc)2011-10-153-129/+195
| | | | | | | | internal to aid code reading/analysis. Remove some unused method arguments
* | Merge commit 'bea65b06a445c267ecb77be08452146cb7fee1ce' into bigmergeMelanie2011-10-251-0/+1
|\ \ | |/
| * Add back the missing bin/addon-modules directory that I somehow managed to ↵Justin Clark-Casey (justincc)2011-10-141-0/+1
| | | | | | | | accidentally delete in 2fbc98f (Jul 7 2011)
* | Merge commit '03102864f0d9851b6937ca5472f48f10ec861a26' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * change default ODE world_stepsize to 0.0178 from 0.02Justin Clark-Casey (justincc)2011-10-141-2/+2
| | | | | | | | | | | | | | | | | | This exactly fits five ODE steps in the default frame time (0.089). This means that ODE execution time now matches the default minimum frame time. This eliminates errors between distance travelled as calculated by ODE in clear air and simple extrapolation. On the old values, ODE would actually do calculations over 0.1 seconds rather than 0.089. This means that once the avatar is at top speed, no additional packets need to be sent for smooth movement, since no error develops between server and viewer. This approach replaces the tweaks previously discussed on the opensim-dev mailing list
* | Merge commit '4bfc2f5cdea4b739110cae3b37945d88ad527334' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * Change hardcoded ODE total frame time to match the default total frame time ↵Justin Clark-Casey (justincc)2011-10-141-1/+1
| | | | | | | | | | | | | | (0.09375 -> 0.089). No apparant ill effects - because the default stepsize is 0.2, there are still 5 physics steps per physics frame. This is a precursor to using the elapsed value passed in (and now changeable in config).
* | Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmergeMelanie2011-10-251-46/+44
|\ \ | |/
| * Bug fix -- Test User on first run standalone might not be created properly: ↵Diva Canto2011-10-131-46/+44
| | | | | | | | let all instances of UserAccountService have all its service references properly initialized, and register console commands on only one.
* | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmergeMelanie2011-10-257-8/+15
|\ \ | |/
| * refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it ↵Justin Clark-Casey (justincc)2011-10-147-8/+15
| | | | | | | | sends entity updates (including presence ones), not just prims.
* | Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmergeMelanie2011-10-252-88/+125
|\ \ | |/
| * Extract NullPhysicsScene from PhysicsScene to improve code readabilityJustin Clark-Casey (justincc)2011-10-142-88/+125
| |
* | Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmergeMelanie2011-10-251-0/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Don't execute rest of code in XEngine.RemoveRegion() and Close() if the ↵Justin Clark-Casey (justincc)2011-10-141-0/+6
| | | | | | | | module is disabled.
* | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmergeMelanie2011-10-252-19/+75
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Expose minimum frame time and update periods for experimentation.Justin Clark-Casey (justincc)2011-10-132-19/+75
| | | | | | | | | | | | | | 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 bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * refactor: Put the frame update period when temporary objects are cleaned up ↵Justin Clark-Casey (justincc)2011-10-131-4/+4
| | | | | | | | in a field, like all the other update periods
* | Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmergeMelanie2011-10-251-29/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * refactor: chain the two scene constructors together to eliminate more copypastaJustin Clark-Casey (justincc)2011-10-131-29/+1
| |
* | Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmergeMelanie2011-10-252-6/+13
|\ \ | |/
| * Tie reported FPS correction factor into the minimum frame time rather than ↵Justin Clark-Casey (justincc)2011-10-132-6/+13
| | | | | | | | | | | | setting separately. This makes reported FPS scale as required if min frame time changes
* | Merge commit 'ceb326284e49f0817fa0f848136ff60e6f66568f' into bigmergeMelanie2011-10-251-1/+12
|\ \ | |/
| * Move fps stat adjustment factor into field rather than hard-coded.Justin Clark-Casey (justincc)2011-10-131-1/+12
| |
* | Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmergeMelanie2011-10-253-8/+39
|\ \ | |/
| * More method doc and formatting changes. Makes DestroyOdeStructures() privateJustin Clark-Casey (justincc)2011-10-133-8/+39
| |
* | Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmergeMelanie2011-10-252-91/+79
|\ \ | |/
| * refactor: move 3x copy/pasted ode structure removal code in ODECharacter ↵Justin Clark-Casey (justincc)2011-10-132-91/+79
| | | | | | | | | | | | into a DestroyOdeStructures() method also adds some method doc
* | Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmergeMelanie2011-10-253-9/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-10-123-44/+1
| |
* | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmergeMelanie2011-10-255-54/+6
|\ \ | |/
| * Get rid of some traces of the old pre-ROBUST grid architecture configJustin Clark-Casey (justincc)2011-10-125-54/+6
| |
* | Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmergeMelanie2011-10-256-354/+291
|\ \ | |/
| * Bring LindenUDP.Tests back from the dead. No tests are running.Justin Clark-Casey (justincc)2011-10-126-354/+291
| | | | | | | | Code drift means that most of this stuff doesn't compile but the structure is still useful.
* | Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmergeMelanie2011-10-252-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-122-2/+5
| | | | | | | | user knows why they are waiting.
* | Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmergeMelanie2011-10-253-3/+12
|\ \ | |/
| * minor: insert some commented out log lines which are a blunt but useful ↵Justin Clark-Casey (justincc)2011-10-123-3/+12
| | | | | | | | instrument to see packet expiry and received acks
* | Merge commit '36e73dbc9b7fb46885865f5537c43a29239fd559' into bigmergeMelanie2011-10-250-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-126-2/+12
| |\
* | \ Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmergeMelanie2011-10-253-17/+39
|\ \ \ | |/ /
| * | Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollectionJustin Clark-Casey (justincc)2011-10-123-17/+39
| | |