aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-289-27/+128
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry ↵Justin Clark-Casey (justincc)2012-01-281-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-287-21/+116
| | | | | | | | same grid don't have the publisher as owner.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-286-10/+10
| |\
| * | Comment out xfer section in Scene.UpdateTaskInventory() which was causing ↵Justin Clark-Casey (justincc)2012-01-281-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.
* | | Completely disable NPC being sensed as agents, the abuse potential is too greatMelanie2012-01-282-5/+10
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-2813-27/+93
|\ \ \ | | |/ | |/|
| * | Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-286-10/+10
| |/ | | | | | | agent id anyway
| * Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().Justin Clark-Casey (justincc)2012-01-287-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 careminsterMelanie2012-01-274-22/+126
|\ \ | |/
| * Increment LPS script stat for OSSL functions that were not already doing thisJustin Clark-Casey (justincc)2012-01-271-2/+41
| |
| * Implement osIsNpc(key npc):integer. This return TRUE if the given key ↵Justin Clark-Casey (justincc)2012-01-273-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/opensimJustin Clark-Casey (justincc)2012-01-278-17/+139
| |\
| * | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ↵Justin Clark-Casey (justincc)2012-01-274-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 careminsterMelanie2012-01-271-6/+7
|\ \ \ | | |/ | |/|
| * | HG Inventoty: Guard against items not found.Diva Canto2012-01-261-6/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-265-0/+89
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Framework/EstateSettings.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-261-0/+30
| |\ \
| * | | llManageEstateAccess implementation ↵PixelTomsen2012-01-265-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlManageEstateAccess Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | | Merge branch 'master' into careminsterMelanie2012-01-261-0/+27
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Support rejecting a teleport if a user is banned in all parcels that haveMelanie2012-01-261-0/+30
| |/ / | | | | | | | | | spawn points
* | | Merge branch 'master' into careminsterMelanie2012-01-263-11/+100
|\ \ \ | |/ /
| * | Change references from sop to sog and add protection from null refBlueWall2012-01-261-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 testJustin Clark-Casey (justincc)2012-01-262-0/+87
| |
* | Merge branch 'master' into careminsterMelanie2012-01-261-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-261-9/+19
| | | | | | | | | | | | in ScriptInstance. Swallowing exceptions just leads to more mysterious failures later on.
* | Merge branch 'master' into careminsterMelanie2012-01-2615-111/+219
|\ \ | |/ | | | | | | | | 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-263-37/+40
| | | | | | | | | | | | 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/opensimJustin Clark-Casey (justincc)2012-01-254-10/+35
| |\
| | * Update save oar and save iar help responses to reflect new -h|--homenebadon2012-01-252-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 Adams2012-01-252-6/+31
| | | | | | | | | | | | opensim-libs). Change BSScene to use new interface.
| * | refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), ↵Justin Clark-Casey (justincc)2012-01-252-80/+97
| |/ | | | | | | RezNewScript() and rename one RezScript() to RezScriptFromPrim()
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-257-22/+100
| |\
| | * llGetParcelMusicURL implementation ↵Pixel Tomsen2012-01-255-1/+34
| | | | | | | | | | | | | | | | | | 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-251-3/+3
| | | | | | | | | | | | updates bin/LocalUserStatistics.db
| * | Serialize calls to ODE Collide() function across OdeScene instances to ↵Justin Clark-Casey (justincc)2012-01-252-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 fixMelanie2012-01-251-1/+1
| | |
* | | Spin off starting scripts in rezzed objects into a thread to avoid a recursionMelanie2012-01-251-1/+4
| | | | | | | | | | | | into the script engine if the script was suspended inside an event.
* | | Merge branch 'master' into careminsterMelanie2012-01-252-21/+66
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-252-8/+51
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| | * \ Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-241-3/+51
| | |\ \
| | | * | Telehub map items displayedBlueWall2012-01-241-3/+51
| | | | |
| | * | | Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ↵Dan Lake2012-01-241-6/+0
| | | |/ | | |/| | | | | | | | | ObjectCreateDelegate, ObjectDeleteDelegate
| * | | Change the WorldMapModule to use SOG rather than SOP for the telehub ansMelanie2012-01-251-13/+15
| |/ / | | | | | | | | | cover a potential nullref
* | | Merge branch 'master' into careminsterMelanie2012-01-2510-169/+185
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * | Make errors reported by OpenSim when it halts because it can't find certain ↵Justin Clark-Casey (justincc)2012-01-243-20/+12
| | | | | | | | | | | | config sections or files a bit more user friendly.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-241-0/+18
| |\ \ | | |/
| | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-241-0/+18
| | |\
| | | * Put Telehubs on the mapBlueWall2012-01-241-0/+18
| | | |
| * | | Comment out asset statistics section from periodic stats as these have not ↵Justin Clark-Casey (justincc)2012-01-241-108/+109
| |/ / | | | | | | | | | | | | | | | | | | been recorded for a very long time. Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness. Some data is available via other means (e.g. "fcache status").
generated by cgit v1.1 at 2024-12-21 01:39:23 +0000