| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Merge branch 'master' into v3_support | BlueWall | 2012-03-02 | 22 | -317/+256 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-03-02 | 2 | -4/+12 | |
| | |\ \ \ | ||||||
| | | * | | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -2/+1 | |
| | | | |/ | | |/| | ||||||
| | | * | | Send the right name and creation date on the BasicProfileModule. | Diva Canto | 2012-03-01 | 1 | -2/+11 | |
| | | | | | ||||||
| | * | | | ScenePresence line endings and fix AllowMovement default to true. | Dan Lake | 2012-03-02 | 1 | -30/+30 | |
| | |/ / | ||||||
| | * | | In ScenePresence, removed several private variables used to store public ↵ | Dan Lake | 2012-03-01 | 1 | -108/+44 | |
| | |/ | | | | | | | parameters. They were only used by the get/set and make code harder to refactor. | |||||
| | * | minor: Rename pCampbot console prompt to "pCampbot" rather than "Region" | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -1/+1 | |
| | | | ||||||
| | * | Provide feedback on bot login states in pCampbot | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -0/+7 | |
| | | | ||||||
| | * | Move SenseRepeaters.Count check inside the SenseRepeatListLock. | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -4/+4 | |
| | | | | | | | | | No methods in the List class are thread safe in the MS specification/documentation | |||||
| | * | lock SenseRepeatListLock when added a new sensor during script reconstitution. | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -1/+3 | |
| | | | | | | | | | | | This is already being done in the other place where a sensor is added. Adding a sensor whilst another thread is iterating over the sensor list can cause a concurrency exception. | |||||
| | * | Adds an OSSL command for regular expression-based string replacement. Parameters | Mic Bowman | 2012-03-01 | 3 | -0/+32 | |
| | | | | | | | | | | | | | are osReplaceString(string source, string patter, string replace, integer count, integer start) The count parameter specifies the total number of replacements to make, -1 makes all replacements. | |||||
| | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-03-01 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | Fix indexing on string trim | BlueWall | 2012-03-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | Thanks to zadark for pointing this out, smxy for deciphering the ?: operator and Plugh for the fix \o/ yay for IRC | |||||
| | * | | Use a fully stubbed out MockConsole for unit tests rather than inheriting ↵ | Justin Clark-Casey (justincc) | 2012-03-01 | 2 | -23/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | from CommandConsole. This is so that the static MainConsole.Instance doesn't retain references to methods registered by scene and other modules to service commands. This prevents the scene from being garbage collected at the end of a test. This is not the final thing preventing GC - next up is the timer started by SimStatsReporter that holds a reference to Scene that prevents end of test gc. | |||||
| | * | | Flick master up to 0.7.4 | Justin Clark-Casey (justincc) | 2012-02-29 | 1 | -1/+1 | |
| | |/ | ||||||
| | * | Revert "Fix authentication for OpenID provider" | BlueWall | 2012-02-29 | 1 | -2/+2 | |
| | | | | | | | | | This reverts commit 9f597c2d423a80279c4aed042be8a991eedefa21. Fixing OpenID causes issues with other parts of the code. | |||||
| | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-29 | 1 | -2/+2 | |
| | |\ | ||||||
| | * | | Don't start pCampbot if the user doesn't supply bot firstname, lastname stub ↵ | Justin Clark-Casey (justincc) | 2012-02-29 | 1 | -0/+4 | |
| | | | | | | | | | | | | | and password | |||||
| | * | | Use correct casing of RegionSettings.Sandbox in the various database modules. | Justin Clark-Casey (justincc) | 2012-02-29 | 3 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | MySQL and MSSQL have it as Sandbox, sqlite as sandbox. In various different places in every plugin the wrong casing is used... Consistency, who needs it? Or one day sqlite can change to Sandbox. | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-02-29 | 5 | -92/+32 | |
| | |\ \ | ||||||
| | | * | | Fixed two typos. White space cleanups. | Kevin Cozens | 2012-02-28 | 1 | -16/+16 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org> | |||||
| | | * | | Some clean up in WebUtil, remove unused ServiceRequest function. | Mic Bowman | 2012-02-27 | 1 | -71/+7 | |
| | | | | | ||||||
| | | * | | HG: Remove async in posting assets to foreign grid. Mono hates concurrency ↵ | Diva Canto | 2012-02-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | there. | |||||
| | * | | | Call Dispose() via using() on SqliteCommands in WebStatsModule after use. | Justin Clark-Casey (justincc) | 2012-02-28 | 1 | -99/+98 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of /home/opensim/src/opensim into v3_support | BlueWall | 2012-02-29 | 1 | -2/+2 | |
| |\ \ \ \ | | |_|/ | |/| | | ||||||
| | * | | | Fix authentication for OpenID provider | BlueWall | 2012-02-29 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support | BlueWall | 2012-02-25 | 21 | -103/+276 | |
| |\ \ \ \ | | |_|/ | |/| | | ||||||
| | * | | | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented | PixelTomsen | 2012-02-25 | 2 | -4/+8 | |
| | | |/ | |/| | | | | | | | http://opensimulator.org/mantis/view.php?id=5763 | |||||
| | * | | Remove EXPERIMENTAL tags from load iar/save iar commands. | Justin Clark-Casey (justincc) | 2012-02-25 | 1 | -3/+0 | |
| | | | | ||||||
| | * | | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: ↵ | PixelTomsen | 2012-02-24 | 3 | -27/+105 | |
| | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5756 http://opensimulator.org/mantis/view.php?id=5755 http://opensimulator.org/mantis/view.php?id=5754 | |||||
| | * | | Take watchdog alarm calling back outside the m_threads lock. | Justin Clark-Casey (justincc) | 2012-02-24 | 2 | -5/+18 | |
| | | | | | | | | | | | | | This is how it was originally. This stops a very long running alarm callback from causing a problem. | |||||
| | * | | Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ↵ | Justin Clark-Casey (justincc) | 2012-02-24 | 2 | -2/+2 | |
| | | | | | | | | | | | | | returns and for consistency. | |||||
| | * | | Get rid of some of the identical exception catching in Scene.Update(). | Justin Clark-Casey (justincc) | 2012-02-24 | 1 | -17/+1 | |
| | | | | ||||||
| | * | | Stop spurious scene loop startup timeout alarms for scenes with many prims. | Justin Clark-Casey (justincc) | 2012-02-24 | 10 | -26/+65 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout. | |||||
| | * | | In osSetSpeed(), if no avatar for a uuid is found then don't attempt to set ↵ | Justin Clark-Casey (justincc) | 2012-02-24 | 1 | -1/+3 | |
| | | | | | | | | | | | | | speed. | |||||
| | * | | llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTarget | PixelTomsen | 2012-02-24 | 3 | -5/+33 | |
| | | | | ||||||
| | * | | Load appropriate 32-bit/64-bit Windows sqlite dll if using WebStatsModule. | Justin Clark-Casey (justincc) | 2012-02-23 | 1 | -0/+3 | |
| | | | | | | | | | | | | | This should resolve http://opensimulator.org/mantis/view.php?id=5901 | |||||
| | * | | Try to resolve some problems with viewers crashing after hitting parcel ↵ | Justin Clark-Casey (justincc) | 2012-02-23 | 3 | -16/+41 | |
| | |/ | | | | | | | | | | | | | | | | | | | banlines or freezing on the banline. This involves 1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport() 2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1 This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else. This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822 | |||||
| * | | Merge branch 'master' into v3_support | BlueWall | 2012-02-22 | 11 | -48/+32 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-23 | 1 | -8/+2 | |
| | |\ | ||||||
| | | * | Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in ↵ | Justin Clark-Casey (justincc) | 2012-02-22 | 1 | -8/+2 | |
| | | | | | | | | | | | | | constructor and never subsequent set to null. | |||||
| | * | | Add a position parameter to region crossing of objects. This avoids the | Melanie | 2012-02-23 | 8 | -18/+25 | |
| | |/ | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high. | |||||
| | * | Restore the taskItem null check that I accidentally blatted in 5397a6d | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+9 | |
| | | | | | | | | | This is a valid check because the caller could supply an invalid uuid. | |||||
| | * | Fix:LINK_ROOT flag for llGetLinkName() by SinglePrim | PixelTomsen | 2012-02-21 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fix problem with dragging child part inventory item to user inventory. | Justin Clark-Casey (justincc) | 2012-02-21 | 2 | -30/+4 | |
| | | | | | | | | | | | This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller. Resolves http://opensimulator.org/mantis/view.php?id=5569 | |||||
| | * | Revert "Fix:Cannot drag inventory from child prim into inventory ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -8/+4 | |
| | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569" This reverts commit 15ce73caca9ea6448e34b95d344cbbf5c9507f6d. As per the COMMENTS in http://opensimulator.org/mantis/view.php?id=5569, I was going to fix this in a more general way. | |||||
| | * | Fix:Cannot drag inventory from child prim into inventory ↵ | PixelTomsen | 2012-02-21 | 1 | -4/+8 | |
| | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569 | |||||
| * | | V3 Support | BlueWall | 2012-02-22 | 2 | -2/+22 | |
| | | | | | | | | | The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response. | |||||
| * | | V3 Support: | BlueWall | 2012-02-21 | 2 | -2/+22 | |
| |/ | | | | This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on. | |||||
| * | Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate. | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+3 | |
| | | | | | | This uses the same approach as ODE. radams, if this doesn't work for you please feel free to revert. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |