Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 13 | -196/+140 |
|\ | |||||
| * | One more debug message to track an issue on Danger grid. | Diva Canto | 2010-09-04 | 1 | -0/+1 |
| | | |||||
| * | Make User Agent Service and Login Service separable. | Diva Canto | 2010-09-04 | 1 | -10/+32 |
| | | |||||
| * | Added XFF header processing. Untested, for lack of proxy. | Diva Canto | 2010-09-03 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-03 | 9 | -160/+83 |
| | |\ | |||||
| | * | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-09-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make SimianFriendsServiceConnector initialize like the other connectors and ↵ | John Hurliman | 2010-09-03 | 1 | -22/+19 |
| | |/ | |/| | | | | | | | gracefully handle the case where it is loaded but disabled #monoaddinslol | ||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-03 | 1 | -2/+3 |
| |\ \ | | |/ | |||||
| | * | Add another variant of password hash construction to ↵ | Justin Clark-Casey (justincc) | 2010-09-03 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | SimianAuthenticationServiceConnector.CheckPassword() This might be unique to the inventory archiver password check, though at the time it was written, hash construction there should have been identical to other parts of opensim This is from patch http://opensimulator.org/mantis/view.php?id=4983. Thanks cmickeyb. | ||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-03 | 2 | -3/+3 |
| |\ \ | | |/ | |||||
| * | | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors ↵ | John Hurliman | 2010-09-03 | 9 | -160/+83 |
| | | | | | | | | | | | | | | | | | | to handle initialization as graceful as possible with the current broken way region module initialization is done * Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side) | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 2 | -3/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Last+2 tweak | Diva Canto | 2010-09-03 | 1 | -1/+1 |
| | | | |||||
| * | | Last+1 tweak. | Diva Canto | 2010-09-03 | 1 | -1/+1 |
| | | | |||||
| * | | One last tweak, hopefully. | Diva Canto | 2010-09-03 | 1 | -2/+2 |
| | | | |||||
| * | | Another tweak. Sux^2 | Diva Canto | 2010-09-03 | 1 | -2/+2 |
| | | | |||||
| * | | More tweaks related to my previous commit. Tweaks sux. | Diva Canto | 2010-09-03 | 2 | -3/+3 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 5 | -39/+61 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-09-02 | 1 | -1/+23 |
| |\ | |||||
| | * | Fix cast issue | Melanie | 2010-09-02 | 1 | -1/+1 |
| | | | |||||
| | * | Allow increasing the version in system folders | Melanie | 2010-09-02 | 1 | -1/+7 |
| | | | |||||
| | * | Update: Allow the version to increase only | Melanie | 2010-09-02 | 1 | -1/+2 |
| | | | |||||
| | * | Disallow modification of system folders. Prevent changing the type of folders | Melanie | 2010-09-02 | 1 | -1/+16 |
| | | | | | | | | | | | | and prevent resetting the version number | ||||
| * | | Quick fix for making global references for gatekeepers that are not ↵ | Diva Canto | 2010-09-02 | 4 | -28/+38 |
| |/ | | | | | | | domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 1 | -1/+8 |
|\ \ | |/ | |||||
| * | Add automated test at the opensim 'api' level to check that a given item ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -1/+8 |
| | | | | | | | | | | | | goes to the correct directory Also removes some mono compiler warnings | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 8 | -54/+63 |
|\ \ | |/ | |||||
| * | Fix bug in llGiveInventory() where items were disappearing on relog | Justin Clark-Casey (justincc) | 2010-08-23 | 2 | -3/+18 |
| | | | | | | | | | | This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set This may have been broken since commit bd49985a on 2010-05-02 | ||||
| * | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 7 | -51/+45 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 7 | -56/+163 |
|\ \ | |/ | |||||
| * | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵ | Diva Canto | 2010-08-19 | 2 | -12/+21 |
| | | | | | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general. | ||||
| * | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 6 | -46/+144 |
| | | | | | | | | untested. Committing to move to my other computer. | ||||
* | | Someone from germany broke the build :P mentioning no names | meta7 | 2010-08-20 | 1 | -1/+1 |
| | | |||||
* | | Use the database mthod directly to delete items in a single sql swoop | Melanie Thielker | 2010-08-20 | 1 | -11/+1 |
| | | |||||
* | | Delete items as well as folders in XInventoryService.PurgeFolder - this ↵ | meta7 | 2010-08-20 | 1 | -0/+11 |
| | | | | | | | | should make emptying the trash work properly. | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-20 | 1 | -6/+10 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-19 | 1 | -6/+10 |
| |\ \ | | |/ | |||||
| | * | Improve some logging in LandConnector | Justin Clark-Casey (justincc) | 2010-08-19 | 1 | -6/+10 |
| | | | | | | | | | | | | This also eliminate the last 'OGS1' logging message (in this case, an erroneous one) | ||||
* | | | Get maturity level from access number. This addresses mantis #269 | meta7 | 2010-08-20 | 1 | -0/+6 |
|/ / | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 5 | -7/+27 |
|\ \ | |/ | |||||
| * | Fixes mantis #4954 for the xml-rpc calls of the UserAgentServiceConnector. ↵ | Diva Canto | 2010-08-16 | 1 | -2/+13 |
| | | | | | | | | Basically, let's not let the xml-rpc library do the DNS conversion... | ||||
| * | Increased the timeout on AgentUpdate to 30 sec and improved error message to ↵ | Diva Canto | 2010-08-16 | 1 | -2/+2 |
| | | | | | | | | try to catch some weirdnesses going on in HG TPs (and maybe non-HG TPs too). | ||||
| * | Thanks Marck for the patch to mantis #4941 (shortening avies' names on HG) | Diva Canto | 2010-08-15 | 1 | -1/+10 |
| | | |||||
| * | * Fixed a casing typo for Simian profile data | John Hurliman | 2010-08-13 | 2 | -2/+2 |
| | | | | | | | | * Minor logging tweak in Simian asset connector | ||||
* | | clearing some debugmessages | sacha | 2010-08-14 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-10 | 1 | -23/+2 |
|\ \ | |/ | |||||
| * | Enforce DB limits on region name to 32 chars, or else (not good). Removed a ↵ | Diva Canto | 2010-08-10 | 1 | -23/+2 |
| | | | | | | | | piece of code from Hyperlinker that didn't work anyway. Shortened the hyperlink region name. | ||||
* | | Whitespace conflict | Melanie Thielker | 2010-08-09 | 1 | -4/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-09 | 1 | -2/+6 |
|\ \ | |/ |