aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-2620-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-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-259-12/+38
| |\
| | * 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-257-8/+34
| | | | | | | | | | | | 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").
| * | Fix "Abnormal client thread terminations" stat in period CONNECTION ↵Justin Clark-Casey (justincc)2012-01-241-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/opensimJustin Clark-Casey (justincc)2012-01-241-13/+0
| |\ \
| | * | Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, ↵Dan Lake2012-01-241-13/+0
| | | | | | | | | | | | | | | | OnObjectDuplicate
| * | | Comment out inventory statistics section from periodic stats, since this ↵Justin Clark-Casey (justincc)2012-01-241-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-241-2/+2
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-2413-9/+481
| |\ \ | | |/
| * | Restrict accessible of ODECharacter Shell and Body. Add method doc and some ↵Justin Clark-Casey (justincc)2012-01-242-12/+27
| | | | | | | | | | | | error log lines.
* | | Merge branch 'master' into careminsterMelanie2012-01-240-0/+0
|\ \ \ | | |/ | |/|
| * | Teleport routing, part 1Melanie2012-01-241-0/+53
| | |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-240-0/+0
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2012-01-240-0/+0
| |\ \ \ | | |/ /
| | * | Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-243-59/+31
| | | | | | | | | | | | | | | | spwan point positioning on rotated telehubs.
* | | | Add handling bans properlyMelanie2012-01-241-1/+1
| | | |
* | | | Add teleport routing, first partMelanie2012-01-241-0/+59
|/ / /
* | | Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-243-59/+31
| | | | | | | | | | | | spwan point positioning on rotated telehubs.
* | | Merge branch 'master' into careminsterMelanie2012-01-240-0/+0
|\ \ \ | |/ /
| * | Reverse the spawn point distance vectorMelanie2012-01-242-4/+4
| | |
* | | Reverse the spawn point distance vectorMelanie2012-01-242-4/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-240-0/+0
|\ \ \ | |/ /
| * | Correct a coordinate to make the viewer like itMelanie2012-01-242-3/+3
| | |
* | | Correct a coordinate to make the viewer like itMelanie2012-01-242-3/+3
| | |
* | | Correct some SQL syntaxMelanie2012-01-241-1/+1
| | |
* | | Fix merge artefacts and build breakMelanie2012-01-241-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-240-0/+0
|\ \ \ | |/ /
| * | Add a forgotten parameterMelanie2012-01-241-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-245-208/+146
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
generated by cgit v1.1 at 2024-10-20 05:43:07 +0000