Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenario | Melanie | 2011-11-02 | 1 | -4/+3 | |
| |/ | ||||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-30 | 1 | -1/+1 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| * | Remove completely unused SOG.Rotation parameter | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -1/+1 | |
| | | | | | | | | We always use SOP.Rotation instead | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 3 | -24/+21 | |
|\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| * | Continuation of previous checkin. Found more places where ↵ | Dan Lake | 2011-10-27 | 1 | -15/+9 | |
| | | | | | | | | ForEachScenePresence can be changed to ForEachRootScenePresence. | |||||
| * | Added new ForEachRootScenePresence to Scene since almost every delegate ↵ | Dan Lake | 2011-10-27 | 1 | -10/+10 | |
| | | | | | | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors. | |||||
| * | For now, comment out error message on new script engine console commands. | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -1/+4 | |
| | | | | | | | | This causes false positives if a simulator has more than 1 region and the current region is 'root' since this sends the command separately to each region and each region has its own XEngine | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 3 | -10/+86 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| * | Added optional owner classes to existing OSSL agent Permissions | Michelle Argus | 2011-10-26 | 1 | -6/+61 | |
| | | | | | | | | | | | | PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes. Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | Implementation of PRIM_OMEGA, but only for setting | SignpostMarv Martin | 2011-10-26 | 2 | -4/+18 | |
| | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | Implementing PRIM_LINK_TARGET, but only for setting params | SignpostMarv Martin | 2011-10-26 | 2 | -4/+14 | |
| | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
* | | 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 branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-10-19 | 1 | -67/+91 | |
| |\ | ||||||
* | \ | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 | |
|\ \ \ | |/ / | ||||||
| * | | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵ | Dan Lake | 2011-10-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | scene presence by client ID. | |||||
* | | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge | Melanie | 2011-10-25 | 1 | -36/+109 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Extend scripts stop/start/suspend/resume console commands to allow action on ↵ | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -67/+91 | |
| |/ | | | | | | | | | | | 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 | |
|\ \ | |/ | ||||||
| * | Add "show scripts" command to show all scripts currently known to the script ↵ | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -2/+28 | |
| | | | | | | | | | | | | engine in the current region. Also added synonym of "scripts show" | |||||
* | | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | refactor: Use SOP.SitTargetAvatar instead of calling a special ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -1/+1 | |
| | | | | | | | | GetAvatarOnSitTarget() which returned exactly the same thing | |||||
* | | Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | rename OS_NPC_SIT_IMMEDIATE to OS_NPC_SIT_NOW since it's shorter and more ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | understandable This makes something like osNpcSit(npc, llGetKey(), OS_NPC_IMMEDIATE) now become osNpcSit(npc, llGetKey(), OS_NPC_SIT_NOW); This is why it's in development :) | |||||
* | | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge | Melanie | 2011-10-25 | 3 | -0/+17 | |
|\ \ | |/ | ||||||
| * | Implement osNpcStand(<npc-id>) | Justin Clark-Casey (justincc) | 2011-10-17 | 3 | -0/+17 | |
| | | | | | | | | Allows you to stand an NPC that has sat. | |||||
* | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 4 | -0/+19 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 4 | -0/+19 | |
| | | | | | | | | | | | | | | | | | | Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE) e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE); At the moment, sit only succeeds if the part has a sit target set. NPC immediately sits on the target even if miles away - they do not walk up to it. This method is in development - it may change so please don't trust it yet. Standing will follow shortly since that's kind of important once you're sitting :) | |||||
* | | Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge | Melanie | 2011-10-25 | 1 | -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-14 | 1 | -0/+6 | |
| | | | | | | | | module is disabled. | |||||
* | | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+0 | |
|\ \ | |/ | ||||||
| * | Get rid of some traces of the old pre-ROBUST grid architecture config | Justin Clark-Casey (justincc) | 2011-10-12 | 1 | -2/+0 | |
| | | ||||||
* | | 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 '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 '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge | Melanie | 2011-10-12 | 2 | -2/+2 | |
|\ \ | |/ | ||||||
| * | Convert getLastReportedSimFPS() and getLastReportedSimStats() into more ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 2 | -2/+2 | |
| | | | | | | | | idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter | |||||
* | | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge | Melanie | 2011-10-12 | 2 | -2/+2 | |
|\ \ | |/ | ||||||
| * | refactor: have lsl and ossl interrogate scene.StatsReporter directly rather ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 2 | -2/+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 |