Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-02-16 | 2 | -2/+17 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | ||||
| * | Fix some logic mistakes where firstly osNpcCreate() without options was ↵ | Justin Clark-Casey (justincc) | 2012-02-16 | 2 | -3/+18 |
| | | | | | | | | | | | | creating npcs sensed as agents and secondly the OS_NPC_SENSE_AS_AGENT option was having the opposite effect. Hopefully makes progress on addressing http://opensimulator.org/mantis/view.php?id=5872 | ||||
* | | Prevent object loss and positioning outside the region with failed object sim | Melanie | 2012-02-14 | 1 | -3/+9 |
| | | | | | | | | crossings | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-10 | 1 | -9/+20 |
|\ \ | |/ | |||||
| * | Fix an npc delete race condition with LSL sensors where an initial presence ↵ | Justin Clark-Casey (justincc) | 2012-02-10 | 1 | -9/+20 |
| | | | | | | | | | | | | | | check could succeed but then the npc removed before the subequent npc check. The resulting null would cause an exception. We now check for null before looking at SenseAsAgent. Hopefully fixes http://opensimulator.org/mantis/view.php?id=5872 | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-09 | 1 | -1/+7 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | minor: put in commented out logging statements for future reuse | Justin Clark-Casey (justincc) | 2012-02-09 | 1 | -1/+7 |
| | | |||||
* | | Push more NPC stuff into threads | Melanie | 2012-02-08 | 1 | -8/+18 |
| | | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-07 | 5 | -25/+113 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 5 | -25/+113 |
| |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | Add a regression test to compile and start a script. Remove ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 5 | -26/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory. Later path concatenation is already done by Path.Combine() which handles any trailing slash. Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory. | ||||
* | | | Experimental. Expand Fire & Forget for NPC delete | Melanie | 2012-02-06 | 1 | -7/+7 |
|/ / | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 1 | -15/+17 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * | Add missing RCERR_UNKNOWN and RCERR_SIM_PERF_LOW LSL constants that would ↵ | Justin Clark-Casey (justincc) | 2012-02-04 | 1 | -0/+2 |
| | | | | | | | | eventually be used by llCastRay(), though OpenSim does not use these yet. | ||||
| * | Correct RC_* LSL constants used by llCastRay(). | Justin Clark-Casey (justincc) | 2012-02-04 | 1 | -12/+12 |
| | | | | | | | | Many thanks to WhiteStar for doing the research on this. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 2 | -1/+7 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-03 | 2 | -1/+7 |
| |\ | |||||
| | * | D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not ↵ | Justin Clark-Casey (justincc) | 2012-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | llGetLinkNumber(). | ||||
| | * | Add llGetLinkNumberOfSides to LSL_Stub and ILSL_Api | Justin Clark-Casey (justincc) | 2012-02-02 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | It already existed in LSL_Api but it also needs to exist in these two other places for a script to be able to see it. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5489 | ||||
| * | | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more | Melanie | 2012-02-02 | 1 | -31/+68 |
| |/ | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts) | ||||
* | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 1 | -31/+70 |
| | | |||||
* | | Fix remembering attachment point and position when an item is rezzed in world. | Melanie | 2012-02-02 | 1 | -49/+50 |
| | | | | | | | | | | Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script in the root. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 1 | -8/+52 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Lay out script status in property per row format, since getting too long for ↵ | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -6/+12 |
| | | | | | | | | console lines. | ||||
| * | Add count of events queued for a particular script in "scripts show" console ↵ | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -4/+9 |
| | | | | | | | | command | ||||
| * | Make script console commands only show for selected region. | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -0/+9 |
| | | |||||
| * | Implement "xengine status" console command to show various xengine stats | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -4/+28 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-31 | 1 | -3/+3 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs | ||||
| * | Fix:llSetText - limited text to a maximum of 254 chars | PixelTomsen | 2012-01-31 | 1 | -3/+3 |
| | | | | | | | | | | | | mantis: http://opensimulator.org/mantis/view.php?id=5867 Signed-off-by: nebadon <michael@osgrid.org> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-29 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix llEdgeOfWorld functionality - see mantis ↵ | Garmin Kawaguichi | 2012-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5865 Signed-off-by: nebadon <michael@osgrid.org> | ||||
* | | Make all NPCs owned by default | Melanie | 2012-01-28 | 1 | -1/+1 |
| | | |||||
* | | Fix build break | Melanie | 2012-01-28 | 1 | -1/+2 |
| | | |||||
* | | Completely disable NPC being sensed as agents, the abuse potential is too great | Melanie | 2012-01-28 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 3 | -6/+18 |
|\ \ | |/ | |||||
| * | Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate(). | Justin Clark-Casey (justincc) | 2012-01-28 | 3 | -6/+18 |
| | | | | | | | | | | This allows NPCs to be sensed as agents by LSL sensors rather than as a specific NPC type (which is currently an OpenSimulator-only extension). Wiki doc on this and other recent NPC functions will follow soon | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-27 | 3 | -21/+125 |
|\ \ | |/ | |||||
| * | Increment LPS script stat for OSSL functions that were not already doing this | Justin Clark-Casey (justincc) | 2012-01-27 | 1 | -2/+41 |
| | | |||||
| * | Implement osIsNpc(key npc):integer. This return TRUE if the given key ↵ | Justin Clark-Casey (justincc) | 2012-01-27 | 3 | -0/+29 |
| | | | | | | | | belongs to an NPC in the region. FALSE if not or if the NPC module isn't present. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-27 | 4 | -0/+83 |
| |\ | |||||
| * | | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ↵ | Justin Clark-Casey (justincc) | 2012-01-27 | 3 | -19/+55 |
| | | | | | | | | | | | | | | | | | | | | | NPC, the npc's own key for an 'unowned' NPC and NULL_KEY is the input key was not an npc. llGetOwnerKey() could also be extended but this does not allow one to distinguish between an unowned NPC and some other result (e.g. 'no such object' if NULL_KEY is the return. Also, any future extensions to LSL functions by Linden Lab are unpredictable and OpenSim-specific extensions could clash. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 4 | -0/+83 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Framework/EstateSettings.cs | ||||
| * | | llManageEstateAccess implementation ↵ | PixelTomsen | 2012-01-26 | 4 | -0/+83 |
| |/ | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlManageEstateAccess Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 1 | -8/+17 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | ||||
| * | Re-enable error logging associated with assembly and script loading failure ↵ | Justin Clark-Casey (justincc) | 2012-01-26 | 1 | -9/+19 |
| | | | | | | | | | | | | in ScriptInstance. Swallowing exceptions just leads to more mysterious failures later on. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 3 | -1/+19 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), ↵ | Justin Clark-Casey (justincc) | 2012-01-25 | 1 | -1/+2 |
| | | | | | | | | RezNewScript() and rename one RezScript() to RezScriptFromPrim() | ||||
| * | llGetParcelMusicURL implementation ↵ | Pixel Tomsen | 2012-01-25 | 3 | -0/+18 |
| | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlGetParcelMusicURL Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
* | | Typo fix | Melanie | 2012-01-25 | 1 | -1/+1 |
| | | |||||
* | | Spin off starting scripts in rezzed objects into a thread to avoid a recursion | Melanie | 2012-01-25 | 1 | -1/+4 |
| | | | | | | | | into the script engine if the script was suspended inside an event. |