| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-25 | 11 | -138/+370 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||||
| | * | | Rename "image queues clear" console command to "clear image queues" | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -12/+6 | |
| | | | | | | | | | | | | | | | | There is less justification for this word arrangement (verb after noun) now that command help is categorized. Also removes "image queues show" in favour of existing alias "show image queues". | |||||
| | * | | Add information about each column to "show queues" region console command help. | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -2/+9 | |
| | | | | ||||||
| | * | | Extend region console "show queues" command to show already collected time ↵ | Justin Clark-Casey (justincc) | 2012-07-24 | 2 | -19/+26 | |
| | | | | | | | | | | | | | since last packeted received by the simulator from a viewer. | |||||
| | * | | Remove bad using statement in AttachmentsModuleTests. | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -2/+1 | |
| | | | | | | | | | | | | | It seems that the mono 2.10.8.1 doesn't choke on this but for some reason 2.4.3 fails. | |||||
| | * | | extend regression TestRezScriptedAttachmentFromInventory() to check actual ↵ | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -3/+19 | |
| | | | | | | | | | | | | | start of script rather than just the script status reported by SOG.ContainsScripts() | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-24 | 7 | -96/+265 | |
| | |\ \ | ||||||
| | | * | | BulletSim: update BulletSim.dlls and so's | Robert Adams | 2012-07-23 | 4 | -0/+0 | |
| | | | | | ||||||
| | | * | | BulletSim: change how prim mass is saved so it is always calculated but zero ↵ | Robert Adams | 2012-07-23 | 1 | -20/+23 | |
| | | | | | | | | | | | | | | | | | is given if not physical. | |||||
| | | * | | BulletSim: small optimizations for link and unlink code | Robert Adams | 2012-07-23 | 1 | -12/+8 | |
| | | | | | ||||||
| | | * | | BulletSim: add Dispose() code to free up resources and close log files. | Robert Adams | 2012-07-23 | 1 | -0/+21 | |
| | | | | | ||||||
| | | * | | BulletSim: add all the new functions to BulletSimAPI. | Robert Adams | 2012-07-23 | 2 | -6/+139 | |
| | | | | | | | | | | | | | | | | | Modify ZeroMotion() to not make tainting calls and to use new API calls. | |||||
| | | * | | BulletSim: improve linking to add each link individually rather than ↵ | Robert Adams | 2012-07-23 | 1 | -60/+76 | |
| | | | | | | | | | | | | | | | | | rebuilding the object each time. Makes it an O(n) operation rather than O(n\!). | |||||
| | * | | | extend regression TestDetachScriptedAttachementToInventory() to check ↵ | Justin Clark-Casey (justincc) | 2012-07-24 | 2 | -5/+45 | |
| | |/ / | | | | | | | | | | correct running status on a re-rezzed attachment | |||||
| * | | | Remove support for the OS_NPC constant. That one seems to be overly paranoid | Melanie | 2012-07-25 | 2 | -4/+2 | |
| | | | | | | | | | | | | | to have and confuses the issue. | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-07-23 | 5 | -42/+81 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Change attachment handling to remove object from the scene first as per | Melanie | 2012-07-23 | 5 | -42/+81 | |
| | | | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-23 | 0 | -0/+0 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Change attachment handling to remove object from the scene first as per | Melanie | 2012-07-23 | 5 | -42/+82 | |
| | | | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-23 | 0 | -0/+0 | |
| |\ \ \ | |/ / | ||||||
| | * | | Committing Avination's memleak fix-a-thon, installment #3 | Melanie | 2012-07-23 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | When linking, detach the no longer used SOG's from backup so they can be collected. Since their Children collection is never emptied, they prevent their former SOPs from being collected as well. | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-07-23 | 1 | -1/+1 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Fix double-ping on logout by not sending a stop packet to the client | Melanie | 2012-07-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | if the client told us it wants to log out in the first place. | |||||
| | * | | Fix the order of operations on detach. The object must always be serialized | Melanie | 2012-07-20 | 1 | -6/+10 | |
| | | | | | | | | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this! | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-23 | 0 | -0/+0 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Committing Avination's memleak fix-a-thon, installment #2 | Melanie | 2012-07-23 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | Ensure items coming off the lockless queue are released. Also ensure this is done when the queue is cleared. | |||||
| | * | | Commiting Avination's memleak fix-a-thon, installment #1 | Melanie | 2012-07-23 | 1 | -4/+8 | |
| | | | | | | | | | | | | | | | | As the MinHeap shrinks, free object references that have been sent. Also, free the last item when it empties. | |||||
| * | | | Fix merge issues in prebuild | Melanie | 2012-07-23 | 1 | -33/+33 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-23 | 16 | -253/+762 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml | |||||
| | * | | Update BulletSim DLLs and SOs | Robert Adams | 2012-07-20 | 2 | -0/+0 | |
| | | | | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-20 | 7 | -60/+61 | |
| | |\ \ | ||||||
| | | * | | Reorder BulletSim in prebuild.xml so OpenSim.Region.CoreModules is compiled ↵ | Robert Adams | 2012-07-20 | 1 | -58/+58 | |
| | | | | | | | | | | | | | | | | | before BulletSim is | |||||
| | | * | | BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs ↵ | Robert Adams | 2012-07-20 | 6 | -2/+3 | |
| | | | | | | | | | | | | | | | | | attempting to fix a mono compile error. | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-20 | 7 | -243/+694 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | BulletSim: more detail logging for vehicle and general physics debugging. | Robert Adams | 2012-07-20 | 4 | -75/+244 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Physical linksets are fully functional. Tweeking of the vehicle code to make it semi-work. Utilize the new API2 for some setting operations. Add GetOrientation() API call for proper reporting of children of linksets. Changes the interface between C# and C++ code so old DLLs won't work! | |||||
| | | * | | Remove an added but unnecessary dependency in prebuild.xml | Robert Adams | 2012-07-20 | 1 | -1/+0 | |
| | | | | | ||||||
| | | * | | BulletSim: fix compile errors from last commit. Clean up passing of physics ↵ | Robert Adams | 2012-07-20 | 2 | -15/+14 | |
| | | | | | | | | | | | | | | | | | scene into vehicle dynamics code. | |||||
| | | * | | BulletSim: Add very detailed logging to BSDynamics for vehicle debugging | Robert Adams | 2012-07-20 | 3 | -45/+146 | |
| | | | | | ||||||
| | | * | | Correct namespace of BinaryLoggingModule (a cut-and-paste error). Add a ↵ | Robert Adams | 2012-07-20 | 3 | -1/+163 | |
| | | | | | | | | | | | | | | | | | simple, high performance logger for high frequency logging (physics sub-operations, for instance). | |||||
| | | * | | BulletSim: Add PID variables to physical scene. Not PIDing yet, but soon. | Robert Adams | 2012-07-20 | 3 | -101/+97 | |
| | | | | | | | | | | | | | | | | | Cleaned up code and got rid of compile warnings. | |||||
| | | * | | BulletSim: Add detailed and voluminous debug logging that is enabled | Robert Adams | 2012-07-20 | 2 | -40/+65 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with an ini configuration parameter. Correct computation of relative offsets of children in a linkset. Remove a prim from any link relationship before deleting it. Minor code flow cleanups. | |||||
| | * | | | Move RegionConfig.ini.example into bin/Regions/Regions.ini.example - all ↵ | Justin Clark-Casey (justincc) | 2012-07-20 | 1 | -4/+8 | |
| | |/ / | | | | | | | | | | | | | | | | | | | other example files are in the same directory as their real files. Only files ending in .ini and .xml are actually loaded. Also improves the help at the top of Regions.ini.example to mention that OpenSimulator would generate Regions.ini anyway on first startup. | |||||
| | * | | As per opensim-dev mailing list discussion, extend llGetDetectedType() to ↵ | Justin Clark-Casey (justincc) | 2012-07-20 | 1 | -5/+28 | |
| | | | | | | | | | | | | | | | | | | | return OS_NPC if an OS npc is detected. The detection will also return agent is the NPC has been created with the OS_NPC_SENSE_AS_AGENT option. | |||||
| | * | | As per opensim-dev mailing list conversation, introduce OS_NPC constant for ↵ | Justin Clark-Casey (justincc) | 2012-07-20 | 2 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | use with llSensor() This same constant will later be used with llGetDetectedType(). This constant has a different name from NPC to avoid possible conflict with future LSL changes. This constant has a different value to try and avoid unnecessary conflict with future constants that may use the same value. Using the 'NPC' constant with llSensor() will remain valid but is deprecated. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-20 | 4 | -3/+39 | |
| |\ \ \ | |/ / | ||||||
| | * | | Enables support for UUIDs to be returned in lists from | Mic Bowman | 2012-07-20 | 1 | -3/+13 | |
| | | | | | | | | | | | | | | | | | | | modInvoke commands. Thanks SignpostMarv!!! | |||||
| | * | | Implements a very useful OSSL function to test a string to see | Mic Bowman | 2012-07-20 | 3 | -0/+26 | |
| | | | | | | | | | | | | | | | | | | | if it is a UUID. The function is osIsUUID(). Thanks SignpostMarv! | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-20 | 1 | -6/+10 | |
| |\ \ \ | |/ / | ||||||
| | * | | Fix the order of operations on detach. The object must always be serialized | Melanie | 2012-07-20 | 1 | -6/+10 | |
| | | | | | | | | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this! | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-07-20 | 8 | -155/+202 | |
| |\ \ \ | | |/ | |/| | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |