| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-01-29 | 4 | -5/+75 |
| |\ | |||||
| | * | 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> | ||||
| | * | Fix:Get embedded objects in notecard ↵ | PixelTomsen | 2012-01-29 | 1 | -0/+71 |
| | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2607 Signed-off-by: nebadon <michael@osgrid.org> | ||||
| | * | Merge branch 'master' of /home/opensim/var/repo/opensim into mapwork | BlueWall | 2012-01-28 | 9 | -38/+148 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-28 | 9 | -38/+148 |
| | | |\ | |||||
| | * | | | Adding our parcel's generated id to map packets | BlueWall | 2012-01-28 | 1 | -2/+2 |
| | |/ / | |||||
| | * | | Send CHANGED_TELEPORT during local TP again - partially revert ↵ | Bo Iwu | 2012-01-28 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | cf73afec356eed30e169be3ce71edad89b4fdb37 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | | | Make all NPCs owned by default | Melanie | 2012-01-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-01-28 | 9 | -27/+128 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 9 | -27/+128 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | | * | | Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry ↵ | Justin Clark-Casey (justincc) | 2012-01-28 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | | texEntry) for region modules | ||||
| | | * | | Add experimental --publish option to "save oar" so that OARs reloaded to the ↵ | Justin Clark-Casey (justincc) | 2012-01-28 | 7 | -21/+116 |
| | | | | | | | | | | | | | | | | | same grid don't have the publisher as owner. | ||||
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-28 | 5 | -8/+8 |
| | | |\ \ | | | |/ | |||||
| | | * | | Comment out xfer section in Scene.UpdateTaskInventory() which was causing ↵ | Justin Clark-Casey (justincc) | 2012-01-28 | 1 | -13/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spurious errors and "script saved" messages when script properties were changed. Viewers since at least Linden Lab 1.23 use the script upload capability to save script changes. It's unknown whether the commented out code was working for very old viewers or not. Code is commented out to reduce complexity and so that useful error messages don't need to be removed. If there is a substantial population using extremely old viewers that can't upgrade to a newer version 1 viewer (e.g. 1.23) or similar TPV then this can be revisited. | ||||
| * | | | | 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 | 12 | -25/+91 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Remove IClientAPI from the money module. It was only used to pass in the | Melanie | 2012-01-28 | 5 | -8/+8 |
| | |/ | | | | | | | agent id anyway | ||||
| | * | Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate(). | Justin Clark-Casey (justincc) | 2012-01-28 | 7 | -17/+83 |
| | | | | | | | | | | | 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 | 4 | -22/+126 |
| |\ \ | |/ | |||||
| | * | 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 | 6 | -11/+126 |
| | |\ | |||||
| | * | | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ↵ | Justin Clark-Casey (justincc) | 2012-01-27 | 4 | -20/+56 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-26 | 1 | -0/+30 |
| | |\ \ | |||||
| | * | | | 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 | -0/+27 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | | Support rejecting a teleport if a user is banned in all parcels that have | Melanie | 2012-01-26 | 1 | -0/+30 |
| | |/ / | | | | | | | | | | spawn points | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 3 | -11/+100 |
| |\ \ \ | |/ / | |||||
| | * | | Change references from sop to sog and add protection from null ref | BlueWall | 2012-01-26 | 1 | -11/+13 |
| | |/ | | | | | | | I had code made additions to the map module that was based on the earlier work that I did before Melanie made improvements. Updating the new code to incorporate the same changes. | ||||
| | * | Add basic TestAddScript() regression test | Justin Clark-Casey (justincc) | 2012-01-26 | 2 | -0/+87 |
| | | | |||||
| * | | 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 | 13 | -105/+207 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | refactor: change RezScriptFromAgentInventory(), RezNewScript() and ↵ | Justin Clark-Casey (justincc) | 2012-01-26 | 2 | -31/+34 |
| | | | | | | | | | | | | | AddInventoryItem() to accept an agent id rather than a full IClientAPI. This stops some code having to make spurious client == null checks and reduces regression test complexity. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-25 | 4 | -10/+35 |
| | |\ | |||||
| | | * | Update save oar and save iar help responses to reflect new -h|--home | nebadon | 2012-01-25 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | switches which replace -p|--profile ie: "save oar --home=http://hg.osgrid.org:80 region.oar" | ||||
| | | * | Update BulletSim.dll with some interface changes and tuning (see ↵ | Robert Adams | 2012-01-25 | 2 | -6/+31 |
| | | | | | | | | | | | | | opensim-libs). Change BSScene to use new interface. | ||||
| | * | | refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), ↵ | Justin Clark-Casey (justincc) | 2012-01-25 | 2 | -80/+97 |
| | |/ | | | | | | | RezNewScript() and rename one RezScript() to RezScriptFromPrim() | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-25 | 6 | -22/+94 |
| | |\ | |||||
| | | * | llGetParcelMusicURL implementation ↵ | Pixel Tomsen | 2012-01-25 | 4 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlGetParcelMusicURL Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| | * | | minor: stop the WebStatsModule logging UPDATE or INSERT every time it ↵ | Justin Clark-Casey (justincc) | 2012-01-25 | 1 | -3/+3 |
| | | | | | | | | | | | | | updates bin/LocalUserStatistics.db | ||||
| | * | | Serialize calls to ODE Collide() function across OdeScene instances to ↵ | Justin Clark-Casey (justincc) | 2012-01-25 | 2 | -1/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent ODE crashes on simulators running more than one region. It turns out that calls to Collide() are not thread-safe even for objects in different ODE physics worlds due to ODE static caches. For simulators running multiple regions, not serializing calls from different scene loops will sooner or later cause OpenSim to crash with a native stack trace referencing OBBCollider. This affects the default OPCODE collider but not GIMPACT. However, GIMPACT fails for other reasons under some current simulator loads. ODE provides a thread local storage option, but as of ODE r1755 (and r1840) DLLs compiled with this crash OpenSim immediately. | ||||
| * | | | 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. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 2 | -21/+66 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-25 | 2 | -8/+51 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | | * \ | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-01-24 | 1 | -3/+51 |
| | | |\ \ | |||||
| | | | * | | Telehub map items displayed | BlueWall | 2012-01-24 | 1 | -3/+51 |
| | | | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |