aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmergeMelanie2011-10-252-5/+5
|\
| * refactor: rename some AssetHelpers.CreateAsset() methods to ↵Justin Clark-Casey (justincc)2011-10-222-5/+5
| | | | | | | | CreateNotecardAsset()
* | Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmergeMelanie2011-10-251-5/+3
|\ \ | |/
| * very minor removal of old commented out line of code in OdeSceneJustin Clark-Casey (justincc)2011-10-211-5/+3
| |
* | Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmergeMelanie2011-10-251-3/+0
|\ \ | |/
| * remove unnecessary null check on _collisionEventPrimJustin Clark-Casey (justincc)2011-10-201-3/+0
| |
* | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmergeMelanie2011-10-253-25/+32
|\ \ | |/
| * Get OdeScene to use passed in time step rather than hard-coded 0.089Justin Clark-Casey (justincc)2011-10-203-25/+32
| | | | | | | | However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference
* | Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmergeMelanie2011-10-251-12/+4
|\ \ | |/
| * Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless ↵Justin Clark-Casey (justincc)2011-10-201-12/+4
| | | | | | | | | | | | | | | | | | Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime) SinceLastFrame was calculating the interval between any sleep that had occurred to pad out the frame time and the start of the next frame. This would usually be below MinFrameTime but occasionally if the sleep was long it would be above, often due to the time required to update the watchdog. This doesn't appear to play much practical role right now. ODE was actually ignoring it entirely. Bullet might be helped slightly by receiving a non-varying value.
* | Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmergeMelanie2011-10-252-13/+5
|\ \ | |/
| * For now, stop passing timeStep into methods where it's not actually used.Justin Clark-Casey (justincc)2011-10-202-13/+5
| |
* | Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * Change wording on asset requests.Justin Clark-Casey (justincc)2011-10-191-2/+2
| | | | | | | | Not all 'notified missing' assets are a problem. Some are invalid references which happen to be buried in other text.
* | Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmergeMelanie2011-10-251-5/+0
|\ \ | |/
| * Removed redundant NotInTransit function from ScenePresence. ↵Dan Lake2011-10-191-5/+0
| | | | | | | | IsInTransit=false does the same thing and NotInTransit was not used anywhere.
* | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmergeMelanie2011-10-255-318/+318
|\ \ | |/
| * Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line ↵Dan Lake2011-10-195-318/+318
| | | | | | | | endings from previous commit.
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-10-192-72/+100
| |\
* | \ Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-259-344/+319
|\ \ \ | |/ /
| * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵Dan Lake2011-10-199-344/+319
| | | | | | | | | | | | scene presence by client ID.
* | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmergeMelanie2011-10-252-41/+118
|\ \ \ | | |/ | |/|
| * | Extend scripts stop/start/suspend/resume console commands to allow action on ↵Justin Clark-Casey (justincc)2011-10-192-72/+100
| |/ | | | | | | | | | | a single script by giving the script item id (which can be found via scripts show). Not an ideal way to do this on a region with many scripts. Needs refinement later.
| * Add "scripts stop" and "scripts start" console commands.Justin Clark-Casey (justincc)2011-10-191-2/+48
| | | | | | | | | | These will stop all running scripts and start all stopped scripts respectively. A stopped script does not save any events for later processing.
| * minor: improve command help on scripts suspend/resumeJustin Clark-Casey (justincc)2011-10-191-2/+5
| |
* | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmergeMelanie2011-10-252-22/+54
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Fix resume scripts.Justin Clark-Casey (justincc)2011-10-192-9/+33
| | | | | | | | | | On resume, we need to place requeue the script for event processing if there are any events on the queue. Also need to do this under m_Script lock in order to avoid a race
* | Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmergeMelanie2011-10-252-4/+52
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add "scripts suspend" and "scripts resume" commands.Justin Clark-Casey (justincc)2011-10-192-3/+53
| | | | | | | | | | These aim currently to suspend and resume all scripts. However, resume isn't currently working due to what looks like a bug in resume functionality itself.
* | Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * on log and "show scripts" messages, show script item UUID rather than asset UUIDJustin Clark-Casey (justincc)2011-10-191-4/+4
| | | | | | | | The item ID is the one required for any script manipulation on the command line, so I think it's somewhat more useful to show this bearing in mind the limited space available
* | Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmergeMelanie2011-10-253-7/+31
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * add current script status to "scripts show" command (running, suspended, etc.)Justin Clark-Casey (justincc)2011-10-193-7/+31
| |
* | Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmergeMelanie2011-10-252-2/+28
|\ \ | |/
| * Add "show scripts" command to show all scripts currently known to the script ↵Justin Clark-Casey (justincc)2011-10-192-2/+28
| | | | | | | | | | | | engine in the current region. Also added synonym of "scripts show"
* | Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmergeMelanie2011-10-251-0/+6
|\ \ | |/
| * Temporarily put in log lines to record time taken to set terrain in OdeScene.Justin Clark-Casey (justincc)2011-10-181-0/+6
| |
* | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmergeMelanie2011-10-252-2/+10
|\ \ | |/
| * Store scene identifier passed in to OdeScene for later debug messagesJustin Clark-Casey (justincc)2011-10-182-2/+10
| |
* | Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmergeMelanie2011-10-251-16/+13
|\ \ | |/
| * Don't bother taking OdeLock during OdeScene construction, since there can be ↵Justin Clark-Casey (justincc)2011-10-181-16/+13
| | | | | | | | no contention until the object is constructed.
* | Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmergeMelanie2011-10-251-18/+13
|\ \ | |/
| * Remove unnecessary lock of OdeLock in OdePrim.changeadd()Justin Clark-Casey (justincc)2011-10-181-18/+13
| | | | | | | | This taint can only ever be processed from the OdeScene.Simulate() loop, which already locks OdeLock.
* | Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmergeMelanie2011-10-252-1/+3
|\ \ | |/
| * minor: method doc to explain a lock of OdeLockJustin Clark-Casey (justincc)2011-10-182-1/+3
| |
* | Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmergeMelanie2011-10-254-97/+81
|\ \ | |/
| * Remove the unused CollisionLocker from ODEJustin Clark-Casey (justincc)2011-10-184-97/+81
| | | | | | | | Despite its name, this wasn't actually being used in any collision checking
* | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmergeMelanie2011-10-252-6/+11
|\ \ | |/
| * Allow an avatar to be explicitly named to the "debug packet" commandJustin Clark-Casey (justincc)2011-10-172-6/+11
| |
* | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmergeMelanie2011-10-254-23/+13
|\ \ | |/