Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -2/+0 |
|\ | |||||
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -9/+1 |
| | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| * | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 1 | -2/+8 |
| | | |||||
| * | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -0/+2 |
|\ \ | |||||
| * | | * more url / hg cleanup | Jonathan Freedman | 2010-10-20 | 1 | -0/+2 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 6 | -10/+68 |
|\ \ | |/ | |||||
| * | Made the home agent handler check for xff if behind a proxy. | Diva Canto | 2010-10-03 | 2 | -3/+23 |
| | | |||||
| * | Made the Gatekeeper proxy-able. | Diva Canto | 2010-10-03 | 3 | -3/+28 |
| | | |||||
| * | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 2 | -4/+17 |
| | | | | | | | | client ip address to agent circuit data, so that it's always there. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Part two of the previous commit, making IGridUserService.LoggedOut() more ↵ | John Hurliman | 2010-09-29 | 1 | -1/+1 |
| | | | | | | | | flexible without changing current behavior | ||||
| * | Made IGridUserService.SetLastPosition() more flexible to allow different ↵ | John Hurliman | 2010-09-29 | 1 | -1/+1 |
| | | | | | | | | possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -0/+79 |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| * | Renamed the Helo server connector to a consistent name. Added this in ↵ | Diva Canto | 2010-09-08 | 1 | -2/+3 |
| | | | | | | | | connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule. | ||||
| * | No need for a config var for the HELO message on the server-side. It's robust. | Diva Canto | 2010-09-08 | 1 | -8/+1 |
| | | |||||
| * | First version of the Hypergrid HELO service that will enable different ↵ | Diva Canto | 2010-09-08 | 1 | -0/+85 |
| | | | | | | | | backends to interoperate. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 5 | -23/+43 |
|\ \ | |/ | |||||
| * | Make User Agent Service and Login Service separable. | Diva Canto | 2010-09-04 | 3 | -21/+28 |
| | | |||||
| * | Added XFF header processing. Untested, for lack of proxy. | Diva Canto | 2010-09-03 | 2 | -2/+15 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 1 | -0/+20 |
|\ \ | |/ | |||||
| * | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 1 | -0/+20 |
| | | | | | | | | untested. Committing to move to my other computer. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 1 | -4/+3 |
|\ \ | |/ | |||||
| * | minor: change some logging levels | Justin Clark-Casey (justincc) | 2010-08-11 | 1 | -3/+2 |
| | | |||||
| * | minor: change "no [GridInfo] config" warning to refer to "configuration ↵ | Justin Clark-Casey (justincc) | 2010-08-11 | 1 | -1/+1 |
| | | | | | | | | files" rather than "OpenSim.ini" | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 1 | -0/+33 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-07 | 1 | -0/+33 |
| |\ | |||||
| | * | Allow creation of link regions if there is an existing region within a 4096 ↵ | Marck | 2010-08-06 | 1 | -0/+33 |
| | | | | | | | | | | | | | | | | | | range. Also add GetHyperlinks() to the grid service. | ||||
| * | | Correct display of landmark about info. Also correct region maturity rating | Melanie Thielker | 2010-08-07 | 1 | -1/+3 |
| |/ | | | | | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity. | ||||
* | | Correct display of landmark about info. Also correct region maturity rating | Melanie Thielker | 2010-08-07 | 1 | -1/+3 |
| | | | | | | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity. | ||||
* | | Allowing the expected purge trash folder... | sacha | 2010-08-06 | 1 | -0/+1 |
| | | | | | | | | Please validate !!! | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-30 | 2 | -1/+15 |
|\ \ | |/ | |||||
| * | Removed opportunity for exception in BaseHttpServer. (mantis #4825) | Diva Canto | 2010-06-30 | 1 | -0/+4 |
| | | |||||
| * | Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken ↵ | Diva Canto | 2010-06-29 | 1 | -0/+4 |
| | | | | | | | | comments in InventoryAccessModule. | ||||
| * | Addresses mantis #4789. Not really a fix, because the event is harmless ↵ | Diva Canto | 2010-06-27 | 1 | -1/+7 |
| | | | | | | | | anyway. Just shouldn't happen normally. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-04 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | Fixed a couple of buglets in Friendship offers / acceptance / decline when ↵ | Diva Canto | 2010-06-04 | 2 | -2/+2 |
| | | | | | | | | avies are in different sims. | ||||
| * | Comment noisy "CONNECTION DEBUGGING" messages, because they push more | Melanie Thielker | 2010-05-27 | 2 | -14/+14 |
| | | | | | | | | important stuff off screen too fast. Clean this time | ||||
| * | Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more" | Melanie | 2010-05-27 | 2 | -14/+14 |
| | | | | | | | | | | | | Some other stuff snuck in. This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a. | ||||
| * | Comment noisy "CONNECTION DEBUGGING" messages, because they push more | Melanie Thielker | 2010-05-27 | 2 | -14/+14 |
| | | | | | | | | important stuff off screen too fast | ||||
| * | Removed sessionID from GridUserservice again. Removed parcel crossing ↵ | Diva Canto | 2010-05-20 | 1 | -2/+1 |
| | | | | | | | | detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface. | ||||
| * | * Added sessionID to IGridUserService.SetLastPosition(), as some connectors ↵ | unknown | 2010-05-20 | 1 | -1/+2 |
| | | | | | | | | | | | | will want to track position against sessionID instead of userID * Updated SimianPresenceServiceConnector to use the new LoggedOut/SetHome/etc methods and only update session position on parcel crossing | ||||
* | | Comment noisy "CONNECTION DEBUGGING" messages, because they push more | Melanie Thielker | 2010-05-27 | 2 | -14/+14 |
| | | | | | | | | important stuff off screen too fast. Clean this time | ||||
* | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵ | Tom Grimshaw | 2010-05-18 | 1 | -0/+23 |
|/ | | | | teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it. | ||||
* | Implement the "delete" path for assets. Adds a new option to allow remote ↵ | Melanie | 2010-05-09 | 2 | -4/+8 |
| | | | | asset deletion in robust handler. | ||||
* | These files are part of the GridUserService write-up. | Diva Canto | 2010-05-07 | 2 | -0/+339 |
| | |||||
* | GridUserService in place. Replaces the contrived concept of storing user's ↵ | Diva Canto | 2010-05-07 | 1 | -43/+2 |
| | | | | | | home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway. BTW, the Meshing files want to be committed too -- EOFs. | ||||
* | Plumb the viewer version string through into AgentCircuitData. Now all that | Melanie Thielker | 2010-05-05 | 1 | -2/+2 |
| | | | | | | is left os to figure out what black magic turns AgentCircuitData into AgentData and then copy that into the ScenePresence, where m_Viewer is already added with this commit and waits for the data. | ||||
* | Add a XMLRPC method to remotely set the login level for the LLLoginService. | Melanie Thielker | 2010-05-05 | 2 | -0/+38 |
| | | | | | | This requires a special XMLRPC call, which has to supply the credentials of a god user (User level >= 200). Disabled by default. Also Adds a configuration option to set the initial permitted login level. | ||||
* | Assorted bug fixes in hypergrid linking. | Diva Canto | 2010-05-03 | 2 | -1/+3 |
| |