| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-01-27 | 1 | -6/+7 |
| |\ | |||||
| | * | HG Inventoty: Guard against items not found. | Diva Canto | 2012-01-26 | 1 | -6/+7 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 5 | -0/+89 |
| |\ \ | |/ | | | | | | | 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 | 5 | -0/+89 |
| | | | | | | | | | | | | | | | | | | | 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 | 20 | -113/+222 |
| |\ \ | |/ | | | | | | | | | 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 | 3 | -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/opensim | Justin Clark-Casey (justincc) | 2012-01-25 | 9 | -12/+38 |
| | |\ | |||||
| | | * | 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 | 7 | -8/+34 |
| | | | | | | | | | | | | | 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 | 7 | -22/+100 |
| | |\ | |||||
| | | * | llGetParcelMusicURL implementation ↵ | Pixel Tomsen | 2012-01-25 | 5 | -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-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 |
| | | | | | | |||||
| | | * | | | Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ↵ | Dan Lake | 2012-01-24 | 1 | -6/+0 |
| | | | |/ | | |/| | | | | | | | | | ObjectCreateDelegate, ObjectDeleteDelegate | ||||
| | * | | | Change the WorldMapModule to use SOG rather than SOP for the telehub ans | Melanie | 2012-01-25 | 1 | -13/+15 |
| | |/ / | | | | | | | | | | cover a potential nullref | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 10 | -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-24 | 3 | -20/+12 |
| | | | | | | | | | | | | | config sections or files a bit more user friendly. | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -0/+18 |
| | |\ \ | | |/ | |||||
| | | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-01-24 | 1 | -0/+18 |
| | | |\ | |||||
| | | | * | Put Telehubs on the map | BlueWall | 2012-01-24 | 1 | -0/+18 |
| | | | | | |||||
| | * | | | Comment out asset statistics section from periodic stats as these have not ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -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"). | ||||
| | * | | Fix "Abnormal client thread terminations" stat in period CONNECTION ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | STATISTICS to count the number of times clients are disconnected due to ack timeouts. This has been broken for a long period and would only ever show 0. | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -13/+0 |
| | |\ \ | |||||
| | | * | | Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, ↵ | Dan Lake | 2012-01-24 | 1 | -13/+0 |
| | | | | | | | | | | | | | | | | | OnObjectDuplicate | ||||
| | * | | | Comment out inventory statistics section from periodic stats, since this ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -14/+15 |
| | |/ / | | | | | | | | | | only contained the now uncollected and irrelevant inventory cache number. | ||||
| | * | | minor: correct text and usage for "image queues show" reigon console command. | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-24 | 13 | -9/+481 |
| | |\ \ | | |/ | |||||
| | * | | Restrict accessible of ODECharacter Shell and Body. Add method doc and some ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 2 | -12/+27 |
| | | | | | | | | | | | | | error log lines. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 0 | -0/+0 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Teleport routing, part 1 | Melanie | 2012-01-24 | 1 | -0/+53 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-01-24 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 0 | -0/+0 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Simplify and streamline telehub editing code. Verify rotations and fix | Melanie | 2012-01-24 | 3 | -59/+31 |
| | | | | | | | | | | | | | | | | | spwan point positioning on rotated telehubs. | ||||
| * | | | | Add handling bans properly | Melanie | 2012-01-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add teleport routing, first part | Melanie | 2012-01-24 | 1 | -0/+59 |
| |/ / / | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |