Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 3 | -4/+139 |
|\ | |||||
| * | Rename some member fields to standard m_ OpenSim code convention | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -8/+8 |
| | | |||||
| * | add header file | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -1/+28 |
| | | |||||
| * | Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -1/+4 |
| | | | | | | | | dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure. | ||||
| * | Removing hard-coded plugin loading in favour of direct class instantiation | SignpostMarv Martin | 2011-03-26 | 1 | -6/+5 |
| | | |||||
| * | Altering log feedback | SignpostMarv Martin | 2011-03-26 | 2 | -14/+17 |
| | | |||||
| * | Fixing bug that occurs when using web login- the result was not checked | SignpostMarv Martin | 2011-03-26 | 1 | -1/+1 |
| | | |||||
| * | Making combined auth service re-use the existing auth services instead of ↵ | SignpostMarv Martin | 2011-03-26 | 1 | -21/+19 |
| | | | | | | | | | | | | duplicating code Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
| * | InfoFormat > DebugFormat | SignpostMarv Martin | 2011-03-26 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
| * | Adding a combined auth service, allowing users to login with either web ↵ | SignpostMarv Martin | 2011-03-26 | 1 | -0/+65 |
| | | | | | | | | | | | | login or password Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
| * | WebkeyAuthenticationService is now no longer a stub! | SignpostMarv Martin | 2011-03-26 | 1 | -5/+35 |
| | | | | | | | | Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
| * | On initial region registration, if the user chooses the option to make the ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -0/+10 |
| | | | | | | | | region part of an existing estate, then list the existing region names. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-10 | 3 | -4/+11 |
|\ \ | |/ | |||||
| * | Add log messages on teleport failure to better pin down the cause. | Justin Clark-Casey (justincc) | 2011-03-09 | 2 | -3/+10 |
| | | |||||
| * | Normalizing comparison to lower case, just in case ppl set their config vars ↵ | Diva Canto | 2011-03-01 | 1 | -1/+1 |
| | | | | | | | | inconsistently. (maybe related to mantis #5386) | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-19 | 3 | -4/+18 |
|\ \ | |/ | |||||
| * | If GridService.GetNeighbours() could not find the region then log a warning ↵ | Justin Clark-Casey (justincc) | 2011-02-18 | 1 | -1/+11 |
| | | | | | | | | | | | | rather than causing a null reference on the normal log line This also extends the TestChildAgentEstablished() test to actually activate the EntityTransferModule, though the test is not yet viable | ||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-02-18 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-02-16 | 1 | -1/+1 |
| |\ | |||||
| | * | Changed default directory for storing map tile images from remote regions. | Marck | 2011-02-16 | 1 | -1/+1 |
| | | | |||||
| * | | Fix bug introduced by Query Access. The response does not come in a packaged ↵ | Diva Canto | 2011-02-16 | 2 | -6/+6 |
| |/ | | | | | | | | | | | _Result field, it comes as simple OSDMap with 2 fields in it. Also in this commit: comment out irrelevant debug message on AuthService. | ||||
| * | Change the QUERYACCESS method to eliminate spurious access denied messages | Melanie | 2011-02-16 | 2 | -2/+17 |
| | | |||||
* | | Change the QUERYACCESS method to eliminate spurious access denied messages | Melanie | 2011-02-16 | 2 | -2/+17 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-16 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Typo | Diva Canto | 2011-02-12 | 1 | -1/+1 |
| | | |||||
* | | Fix merge issues | Melanie | 2011-02-07 | 1 | -48/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 8 | -1259/+332 |
|\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs | ||||
| * | Added an additional debug message, and removed a bunch of files that weren't ↵ | Diva Canto | 2011-02-04 | 4 | -1253/+0 |
| | | | | | | | | being used anymore -- the old RemotsInventory connectors stuff. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2011-02-04 | 2 | -4/+10 |
| |\ | |||||
| | * | minor: correct a log spelling mistake that was pointed out to me | Justin Clark-Casey (justincc) | 2011-02-04 | 1 | -1/+1 |
| | | | |||||
| | * | Bug fixed on map search for HG. Affected queries that had a region name at ↵ | Diva Canto | 2011-02-04 | 1 | -4/+10 |
| | | | | | | | | | | | | the end. | ||||
| | * | minor: Correct misspelling of neighbour in log messages. | Justin Clark-Casey (justincc) | 2011-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | Thanks Fly-Man- | ||||
| * | | Convert SimianMaptile refresh time from ms to seconds. Too many 0's | Mic Bowman | 2011-02-04 | 1 | -11/+12 |
| |/ | | | | | | | in the config file. | ||||
| * | Change UpdateAgent (for changes in agent position) to be sent | Mic Bowman | 2011-02-03 | 1 | -3/+52 |
| | | | | | | | | | | | | once to each simulator rather than once to each region. This should help with some of the delays caused by multiple outstanding requests to a single service point. | ||||
| * | Make the new style stuff compatible with the older revision | Melanie | 2011-01-28 | 1 | -1/+14 |
| | | |||||
| * | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 2 | -4/+8 |
| | | |||||
| * | Also set Godlike flag. Might be useful | Melanie | 2011-01-27 | 1 | -0/+2 |
| | | |||||
| * | Add TeleportFlags.ViaRegionID to the flags sent on login when the region | Melanie | 2011-01-27 | 1 | -8/+13 |
| | | | | | | | | | | was entered by hand to determine whether or not to honor the landing point | ||||
* | | Make the new style stuff compatible with the older revision | Melanie | 2011-01-28 | 1 | -1/+14 |
| | | |||||
* | | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 2 | -4/+8 |
| | | |||||
* | | Also set Godlike flag. Might be useful | Melanie | 2011-01-27 | 1 | -0/+2 |
| | | |||||
* | | Add TeleportFlags.ViaRegionID to the flags sent on login when the region | Melanie | 2011-01-27 | 1 | -8/+13 |
| | | | | | | | | | | was entered by hand to determine whether or not to honor the landing point | ||||
* | | Add a careminster API to scripting again | Melanie | 2011-01-24 | 2 | -0/+8 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 11 | -38/+38 |
|\ \ | |/ | |||||
| * | Put the 'new' back to avoid a warning. Yes, we want to hide it. | Diva Canto | 2011-01-17 | 1 | -1/+1 |
| | | |||||
| * | minor: resolve some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 3 | -5/+6 |
| | | |||||
| * | Prune some of the excess logging for client logins. | Justin Clark-Casey (justincc) | 2011-01-18 | 2 | -2/+2 |
| | | | | | | | | Didn't touch the appearance related stuff. | ||||
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 4 | -11/+11 |
| | | |||||
| * | Reduce amount of debug lopgging put out by some simiangrid connectors. ↵ | Justin Clark-Casey (justincc) | 2011-01-18 | 4 | -21/+20 |
| | | | | | | | | Please re-enable if needed. | ||||
| * | Revert "DEBUG DEBUG DEBUG" | Diva Canto | 2011-01-17 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 59c2cd04ba056b85eb4873e472b95826a1cc13b5. |