| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+1 |
| |\ | |||||
| | * | Fix missing Busy-Mode Response | Pixel Tomsen | 2011-10-22 | 1 | -0/+1 |
| | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5748 | ||||
| * | | Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+3 |
| |\ \ | |/ | |||||
| | * | Add case to Lightshare/Windlight | BlueWall | 2011-10-22 | 1 | -0/+3 |
| | | | | | | | | | Thanks thomax for a patch to add handling for Sun/Moon pos. | ||||
| * | | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 5 | -24/+68 |
| |\ \ | |/ | |||||
| | * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 5 | -24/+68 |
| | | | | | | | | | | | This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743 | ||||
| * | | Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge | Melanie | 2011-10-25 | 2 | -12/+19 |
| |\ \ | |/ | |||||
| | * | redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -12/+19 |
| | | | | | | | | | can comment out some inconsistency | ||||
| * | | Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | correct misleading method doc on CreateNotecardAsset() | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | in AssetHelpers, store the actual text passed in to the method, not the ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -2/+2 |
| | | | | | | | | | string "data" | ||||
| * | | Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+6 |
| |\ \ | |/ | |||||
| | * | encode notecard assets in proper format for tests, rather than just using ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -1/+6 |
| | | | | | | | | | whatever string is given | ||||
| * | | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge | Melanie | 2011-10-25 | 4 | -10/+10 |
| |\ \ | |/ | |||||
| | * | refactor: rename some AssetHelpers.CreateAsset() methods to ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 4 | -10/+10 |
| | | | | | | | | | CreateNotecardAsset() | ||||
| * | | Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge | Melanie | 2011-10-25 | 1 | -21/+41 |
| |\ \ | |/ | |||||
| | * | RemoteAdmin - Added optional terrain loading on region create using ↵ | Michelle Argus | 2011-10-21 | 1 | -21/+41 |
| | | | | | | | | | parameter heightmap_file to specify the terrain file to be loaded | ||||
| * | | Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+3 |
| |\ \ | |/ | |||||
| | * | very minor removal of old commented out line of code in OdeScene | Justin Clark-Casey (justincc) | 2011-10-21 | 1 | -5/+3 |
| | | | |||||
| * | | Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+0 |
| |\ \ | |/ | |||||
| | * | remove unnecessary null check on _collisionEventPrim | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -3/+0 |
| | | | |||||
| * | | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge | Melanie | 2011-10-25 | 3 | -25/+32 |
| |\ \ | |/ | |||||
| | * | Get OdeScene to use passed in time step rather than hard-coded 0.089 | Justin Clark-Casey (justincc) | 2011-10-20 | 3 | -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 bigmerge | Melanie | 2011-10-25 | 1 | -12/+4 |
| |\ \ | |/ | |||||
| | * | Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless ↵ | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -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 bigmerge | Melanie | 2011-10-25 | 2 | -13/+5 |
| |\ \ | |/ | |||||
| | * | For now, stop passing timeStep into methods where it's not actually used. | Justin Clark-Casey (justincc) | 2011-10-20 | 2 | -13/+5 |
| | | | |||||
| * | | Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | Change wording on asset requests. | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -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 bigmerge | Melanie | 2011-10-25 | 1 | -5/+0 |
| |\ \ | |/ | |||||
| | * | Removed redundant NotInTransit function from ScenePresence. ↵ | Dan Lake | 2011-10-19 | 1 | -5/+0 |
| | | | | | | | | | IsInTransit=false does the same thing and NotInTransit was not used anywhere. | ||||
| * | | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge | Melanie | 2011-10-25 | 5 | -318/+318 |
| |\ \ | |/ | |||||
| | * | Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line ↵ | Dan Lake | 2011-10-19 | 5 | -318/+318 |
| | | | | | | | | | endings from previous commit. | ||||
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-10-19 | 2 | -72/+100 |
| | |\ | |||||
| * | \ | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 9 | -344/+319 |
| |\ \ \ | |/ / | |||||
| | * | | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵ | Dan Lake | 2011-10-19 | 9 | -344/+319 |
| | | | | | | | | | | | | | scene presence by client ID. | ||||
| * | | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge | Melanie | 2011-10-25 | 2 | -41/+118 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Extend scripts stop/start/suspend/resume console commands to allow action on ↵ | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -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-19 | 1 | -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/resume | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+5 |
| | | | |||||
| * | | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge | Melanie | 2011-10-25 | 2 | -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-19 | 2 | -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 bigmerge | Melanie | 2011-10-25 | 2 | -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-19 | 2 | -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 bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | on log and "show scripts" messages, show script item UUID rather than asset UUID | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -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 bigmerge | Melanie | 2011-10-25 | 3 | -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-19 | 3 | -7/+31 |
| | | | |||||
| * | | Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+28 |
| |\ \ | |/ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |