Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 4 | -13/+87 |
|\ | |||||
| * | Minor improvement in version checking (Simulation service) | Diva Canto | 2011-04-29 | 1 | -1/+1 |
| | | |||||
| * | Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵ | Diva Canto | 2011-04-28 | 2 | -8/+13 |
| | | | | | | | | the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service. | ||||
| * | Thank you Snoopy for a patch that adds some filtering to client versions ↵ | Diva Canto | 2011-04-27 | 2 | -5/+74 |
| | | | | | | | | allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-25 | 2 | -7/+5 |
|\ \ | |/ | |||||
| * | Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails. | Diva Canto | 2011-04-25 | 1 | -6/+4 |
| | | |||||
| * | Commented verbose debug message. | Diva Canto | 2011-04-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -5/+3 |
|\ \ | |/ | |||||
| * | Adjust freeswitch logging to be somewhat less noisy. However, there is ↵ | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -5/+3 |
| | | | | | | | | still quite a large amount of logging present for debug purposes. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 2 | -14/+17 |
|\ \ | |/ | |||||
| * | Clean up freeswitch config to what is currently required. Add explanation ↵ | Justin Clark-Casey (justincc) | 2011-04-19 | 2 | -14/+17 |
| | | | | | | | | to config parameters. Clean up some log messages. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 16 | -14/+12 |
|\ \ | |/ | |||||
| * | Make all the objects in a coalescence reappears after being loaded from an ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 2 | -1/+14 |
| | | | | | | | | | | | | | | IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing. From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug. It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups. | ||||
| * | Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵ | Diva Canto | 2011-04-12 | 14 | -14/+1 |
| | | | | | | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor: add a bit more method doc to IInventoryService.GetItem() | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-06 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Make the "All Estates" option work from the client (this makes chosen ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | changes to all the estates that the user owns). This applies to adding/removing estate users, groups, managers and bans. This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420 Thanks very much, Snoopy! | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 1 | -1/+36 |
|\ \ | |/ | |||||
| * | Improvement over 2 commits ago: make the hyperlink check understand port 80. | Diva Canto | 2011-03-28 | 1 | -4/+29 |
| | | |||||
| * | Fix mantis #5413. WARNING: new config variable in section [GridService] of ↵ | Diva Canto | 2011-03-28 | 1 | -0/+10 |
| | | | | | | | | the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples. | ||||
* | | Make the login service's call to the sim time out quicker so we have a | Melanie | 2011-03-31 | 1 | -1/+1 |
| | | | | | | | | chance to try fallback before the client quits | ||||
* | | 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. |