| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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> | ||||
| | * | 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 | ||||
| * | | | 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. | ||||
| * | | 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 |
| |\ \ | |/ | |||||
| | * | Teleport routing, part 1 | Melanie | 2012-01-24 | 1 | -0/+53 |
| | | | |||||
| | * | Simplify and streamline telehub editing code. Verify rotations and fix | Melanie | 2012-01-24 | 3 | -59/+31 |
| | | | | | | | | | spwan point positioning on rotated telehubs. | ||||
| | * | Reverse the spawn point distance vector | Melanie | 2012-01-24 | 2 | -4/+4 |
| | | | |||||
| | * | Correct a coordinate to make the viewer like it | Melanie | 2012-01-24 | 2 | -3/+3 |
| | | | |||||
| | * | Add a forgotten parameter | Melanie | 2012-01-24 | 1 | -1/+1 |
| | | | |||||
| | * | Change Telehubs to store only the data that is really needed and not | Melanie | 2012-01-24 | 4 | -194/+123 |
| | | | | | | | | | additional redundant information. | ||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-23 | 1 | -4/+11 |
| | |\ | |||||
| | | * | Merge branch 'master' of /home/opensim/var/repo/opensim into telehub | BlueWall | 2012-01-23 | 2 | -2/+5 |
| | | |\ | |||||
| | | * | | Add update to Telehub position and rotation before adding SpawnPoints | BlueWall | 2012-01-23 | 1 | -4/+11 |
| | | | | | |||||
| | * | | | IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since the | Melanie | 2012-01-23 | 1 | -12/+3 |
| | | |/ | |/| | | | | | | | | | | | | | Telehub commits! They will eat your babies and corrupt your database while they munch. DO NOT use anything from the first Telehub commit to this one. FIRST GOOD COMMIT is the one FOLLOWING this one. You have been warned. | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-23 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-22 | 1 | -0/+3 |
| | | |\ \ | |||||
| | | * | | | Fix up some parameter naming | Melanie | 2012-01-22 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Merge branch 'telehub' | BlueWall | 2012-01-23 | 1 | -53/+55 |
| | |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| | | * | | Cleanup | BlueWall | 2012-01-23 | 1 | -3/+6 |
| | | | | | |||||
| | | * | | Cleanup unused parts, add some error handling | BlueWall | 2012-01-23 | 1 | -53/+52 |
| | | |/ | |||||
| | * | | Add note about setting up test databases | BlueWall | 2012-01-22 | 1 | -0/+3 |
| | |/ | |||||
| | * | Finish connecting Telehub to database | BlueWall | 2012-01-22 | 2 | -47/+25 |
| | | | |||||
| | * | Hooking up new telehub data to the database | BlueWall | 2012-01-22 | 1 | -0/+14 |
| | | | |||||
| | * | Change the key name I missed in last commit | Melanie | 2012-01-22 | 1 | -1/+1 |
| | | | |||||
| | * | Move Telehub tables and data from EstateSettings to RegionSettings. | Melanie | 2012-01-22 | 8 | -267/+273 |
| | | | | | | | | | | | | | | | | | | | | | This is damage control es EstateSettings is not the place this can be put. EstateSettings is nt unique to a region and therefore would introduce a hard limit of one telehub per estate, completely shutting off the option of having SL style telehubs, e.g. one per region. Whole estate teleport routing can still be implemented id desiresd, this way all options are open while the other way most options get closed off. | ||||
| | * | Telehub Support: | BlueWall | 2012-01-21 | 6 | -71/+341 |
| | | | | | | | | | Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-20 | 11 | -33/+149 |
| | |\ | |||||
| | * | | Telehub Support: | BlueWall | 2012-01-20 | 7 | -4/+251 |
| | | | | | | | | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing. | ||||
| * | | | 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. | ||||
| * | | Revert "Change linux, windows and mac ODE libraries to use the GIMPACT ↵ | Justin Clark-Casey (justincc) | 2012-01-20 | 7 | -0/+0 |
| | | | | | | | | | | | | | | | | | collider rather than OPCODE." This reverts commit 4eef6725f4116aa70de729b71d60636a7d0a68f5. Reverting for now since this fails with "terminate called after throwing an instance of 'std::bad_alloc'" on Wright Plaza instances. | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |