| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-03-04 | 6 | -4/+53 |
| |\ | | | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | ||||
| | * | Add WebProfiles config to other config example | BlueWall | 2012-03-04 | 1 | -0/+3 |
| | | | |||||
| | * | Merge branch 'master' of /home/opensim/var/repo/opensim into v3_support | BlueWall | 2012-03-04 | 2 | -8/+3 |
| | |\ | |||||
| | | * | comment out "[CAPS]: ScriptTaskInventory Request" log spam | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | OpenID auth needs hashing before authenticating | BlueWall | 2012-03-02 | 2 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'master' into v3_support | BlueWall | 2012-03-02 | 28 | -317/+275 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of /home/opensim/src/opensim into v3_support | BlueWall | 2012-02-29 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support | BlueWall | 2012-02-25 | 44 | -121/+300 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into v3_support | BlueWall | 2012-02-22 | 11 | -48/+32 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | V3 Support | BlueWall | 2012-02-22 | 3 | -2/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | | | | Add web profile url setting to ini | BlueWall | 2012-02-21 | 1 | -0/+3 |
| | | | | | | | | |||||
| | * | | | | | | 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. | ||||
| * | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-03 | 28 | -321/+274 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | | | | Remove outdated comment about checking attachment prims in ↵ | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scene.PipeEventsForScript() | ||||
| | * | | | | | | Allow a script to receive events if its root prim is in an area where it's ↵ | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -4/+1 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allowed to run rather than checking its own prim. This allows scripts to run in child prims that are outside region boundaries. This is an interim patch applied from http://opensimulator.org/mantis/view.php?id=5899 though it does not resolve that bug Thanks tglion! | ||||
| | * | | | | | 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. | ||||
| | * | | | | | | Remove more now unused third party libraries. | Justin Clark-Casey (justincc) | 2012-03-01 | 4 | -0/+0 |
| | | | | | | | | |||||
| | * | | | | | | Flick master up to 0.7.4 | Justin Clark-Casey (justincc) | 2012-02-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Extend distsrc target to cleanup the files generated by running prebuild | Justin Clark-Casey (justincc) | 2012-02-29 | 1 | -0/+18 |
| | |/ / / / / | |||||
| | * | | | | | 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. | ||||
| | * | | | | | Trigger a build | BlueWall | 2012-02-29 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-29 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | | Fix authentication for OpenID provider | 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' into careminster | Melanie | 2012-02-25 | 27 | -52/+135 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | ||||
| | * | | | | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented | PixelTomsen | 2012-02-25 | 2 | -4/+8 |
| | |/ / / | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5763 | ||||
| | * | | | Move libopenjpeg native libraries into lib32 and lib64 as appropriate. | Justin Clark-Casey (justincc) | 2012-02-25 | 5 | -5/+5 |
| | | | | | |||||
| | * | | | Remove some more unused Bullet libraries. | Justin Clark-Casey (justincc) | 2012-02-25 | 3 | -0/+0 |
| | | | | | |||||
| | * | | | Remove old libbulletnet native libraries. These are not used in the current ↵ | Justin Clark-Casey (justincc) | 2012-02-25 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | | generation bullet physics plugin. | ||||
| | * | | | Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as ↵ | Justin Clark-Casey (justincc) | 2012-02-25 | 9 | -9/+9 |
| | | | | | | | | | | | | | | | | | appropriate. | ||||
| | * | | | Remove xunit.dll, Fadd.Globalization.Yaml.dll and Fadd.dll. It looks like ↵ | Justin Clark-Casey (justincc) | 2012-02-25 | 3 | -0/+0 |
| | | | | | | | | | | | | | | | | | these were once connected with HttpServer.dll but are now unused. | ||||
| | * | | | Remove EXPERIMENTAL tags from load iar/save iar commands. | Justin Clark-Casey (justincc) | 2012-02-25 | 1 | -3/+0 |
| | | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |