aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmergeMelanie2011-10-251-0/+3
|\
| * Add case to Lightshare/WindlightBlueWall2011-10-221-0/+3
| | | | | | | | Thanks thomax for a patch to add handling for Sun/Moon pos.
* | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵Dan Lake2011-10-191-1/+1
| | | | | | | | scene presence by client ID.
* | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmergeMelanie2011-10-251-22/+46
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Fix resume scripts.Justin Clark-Casey (justincc)2011-10-191-8/+32
| | | | | | | | | | 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-251-4/+4
|\ \ | |/ | | | | | | | | 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-191-2/+4
| | | | | | | | | | 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 '116fbe8258e336be3f6ac1e11119214629799faa' into bigmergeMelanie2011-10-251-4/+5
|\ \ | |/ | | | | | | 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-191-4/+5
| |
* | Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmergeMelanie2011-10-251-2/+0
|\ \ | |/
| * Add "show scripts" command to show all scripts currently known to the script ↵Justin Clark-Casey (justincc)2011-10-191-2/+0
| | | | | | | | | | | | engine in the current region. Also added synonym of "scripts show"
* | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * refactor: Use SOP.SitTargetAvatar instead of calling a special ↵Justin Clark-Casey (justincc)2011-10-171-1/+1
| | | | | | | | GetAvatarOnSitTarget() which returned exactly the same thing
* | Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * rename OS_NPC_SIT_IMMEDIATE to OS_NPC_SIT_NOW since it's shorter and more ↵Justin Clark-Casey (justincc)2011-10-171-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 bigmergeMelanie2011-10-253-0/+17
|\ \ | |/
| * Implement osNpcStand(<npc-id>)Justin Clark-Casey (justincc)2011-10-173-0/+17
| | | | | | | | Allows you to stand an NPC that has sat.
* | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmergeMelanie2011-10-254-0/+19
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Implement osNpcSit(). This is still in development so don't trust itJustin Clark-Casey (justincc)2011-10-174-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 '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmergeMelanie2011-10-251-2/+0
|\ \ | |/
| * Get rid of some traces of the old pre-ROBUST grid architecture configJustin Clark-Casey (justincc)2011-10-121-2/+0
| |
* | Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/ | | | | | | 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-121-1/+1
| | | | | | | | user knows why they are waiting.
* | Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmergeMelanie2011-10-122-21/+32
|\ \ | |/
| * osSetParcelDetails - PARCEL_DETAILS_CLAIMDATEPixel Tomsen2011-10-112-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 bigmergeMelanie2011-10-122-2/+2
|\ \ | |/
| * Convert getLastReportedSimFPS() and getLastReportedSimStats() into more ↵Justin Clark-Casey (justincc)2011-10-102-2/+2
| | | | | | | | idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter
* | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmergeMelanie2011-10-122-2/+2
|\ \ | |/
| * refactor: have lsl and ossl interrogate scene.StatsReporter directly rather ↵Justin Clark-Casey (justincc)2011-10-102-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
* | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
| * Removed all refs to IClientAPI from IAttachmentsModule. Separated client ↵Dan Lake2011-10-041-1/+1
| | | | | | | | handlers for attachments to call public interface and rearranged module file into sections
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-031-3/+18
| |\
* | \ Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmergeMelanie2011-10-111-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Removed redundant code in AttachmentsModule and simplified interfaces which ↵Dan Lake2011-10-031-2/+1
| | | | | | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still.
* | | Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmergeMelanie2011-10-111-1/+1
|\ \ \ | | |/ | |/|
| * | trival tweak to trigger the continuous integration systemJustin Clark-Casey (justincc)2011-10-041-1/+1
| | |
* | | Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmergeMelanie2011-10-111-1/+1
|\ \ \ | |/ /
| * | Return NULL_KEY from llGetTexture if a non-existent face is indicated, ↵Justin Clark-Casey (justincc)2011-10-041-1/+1
| | | | | | | | | | | | | | | | | | rather than "" As per http://wiki.secondlife.com/wiki/LlGetTexture
* | | Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmergeMelanie2011-10-111-1/+16
|\ \ \ | |/ /
| * | For llGetTexture(), if the face texture asset is in the inventory, return ↵Justin Clark-Casey (justincc)2011-10-041-1/+16
| |/ | | | | | | | | | | | | | | the inventory name rather than the asset UUID This is as per http://wiki.secondlife.com/wiki/LlGetTexture Applied patch in http://opensimulator.org/mantis/view.php?id=4552 with an additional break statement if an inventory item is found to exit early. Thanks Michelle Argus!
* | Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmergeMelanie2011-10-111-0/+41
|\ \ | |/
| * llGetLinkKey, llGetLinkName Fix for sitting AvatarPixel Tomsen2011-10-011-0/+41
| | | | | | | | | | | | when an avatar sits on a prim, we get now his key & name ;-) http://opensimulator.org/mantis/view.php?id=4476
* | Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmergeMelanie2011-10-113-0/+20
|\ \ | |/
| * llAvatarOnLinkSitTarget ImplementationPixel Tomsen2011-09-293-0/+20
| | | | | | | | http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget
* | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to ↵Justin Clark-Casey (justincc)2011-09-151-1/+1
| | | | | | | | | | | | reflect what it actually does This also makes it consistent with some other methods that send data to the client.
* | Bring us up to date.Tom2011-09-143-50/+103
|\ \ | |/
| * llSetPrimitiveParams Prim type params precision errorsMicheil Merlin2011-09-092-44/+90
| |
generated by cgit v1.1 at 2024-12-21 14:56:20 +0000