Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | 3 | -25/+22 | |
|\ \ | |/ | ||||||
| * | Quick fix for making global references for gatekeepers that are not ↵ | Diva Canto | 2010-09-02 | 3 | -15/+22 | |
| | | | | | | | | 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-23 | 6 | -50/+39 | |
|\ \ | |/ | ||||||
| * | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 6 | -50/+39 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 3 | -27/+107 | |
|\ \ | |/ | ||||||
| * | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 3 | -27/+107 | |
| | | | | | | | | untested. Committing to move to my other computer. | |||||
* | | 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) | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 4 | -6/+17 | |
|\ \ | |/ | ||||||
| * | 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). | |||||
| * | * 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-07 | 2 | -0/+56 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-07 | 2 | -0/+56 | |
| |\ | ||||||
| | * | Added Check4096 config var under [GridService], at the request of many. ↵ | Diva Canto | 2010-08-06 | 2 | -54/+54 | |
| | | | | | | | | | | | | | | | | | | Changed the iteration that Marck had on the Hyperlinker. ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example. | |||||
| | * | Allow creation of link regions if there is an existing region within a 4096 ↵ | Marck | 2010-08-06 | 2 | -0/+56 | |
| | | | | | | | | | | | | | | | | | | 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/+4 | |
| |/ | | | | | | | | | 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/+4 | |
| | | | | | | | | | | 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. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 1 | -5/+19 | |
|\ \ | |/ | ||||||
| * | Better debug messages | Diva Canto | 2010-08-04 | 1 | -5/+19 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-31 | 1 | -0/+2 | |
|\ \ | |/ | ||||||
| * | * Added debug logging to SimianGrid inventory service response parsing | John Hurliman | 2010-07-29 | 1 | -0/+2 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-29 | 1 | -2/+33 | |
|\ \ | |/ | ||||||
| * | Add sending of the avatar interests and configuration of the profiles | Melanie | 2010-07-22 | 1 | -2/+33 | |
| | | | | | | | | | | | | module as an OpenSim profile module to Simian grid services. Patch by Dimentox, thank you. Applied with changes. | |||||
* | | Check cached asset to make sure it contains data, and if not, re-request | Tom Grimshaw | 2010-07-04 | 1 | -3/+3 | |
| | | ||||||
* | | Make sure the AssetServiceConnector times out within 30 seconds. If it ↵ | Tom Grimshaw | 2010-07-03 | 1 | -2/+2 | |
| | | | | | | | | doesn't, the client will get bored and give an upload error, instead of granting success and entering the asset into our retry queue. | |||||
* | | Cache all assets on upload so that the client can still retrieve the asset ↵ | Tom Grimshaw | 2010-07-01 | 1 | -3/+2 | |
| | | | | | | | | if it enters a retry queue | |||||
* | | Fix build break | Tom Grimshaw | 2010-07-01 | 1 | -1/+1 | |
| | | ||||||
* | | Report asset upload success if it has previously failed | Tom Grimshaw | 2010-07-01 | 1 | -0/+4 | |
| | | ||||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-07-01 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-30 | 1 | -1/+1 | |
| |\ \ | | |/ | ||||||
| | * | Fix a simian compiler warning | Melanie | 2010-06-27 | 1 | -1/+1 | |
| | | | ||||||
* | | | Catch newid == null which is what happens if the asset service is offline ↵ | Tom Grimshaw | 2010-07-01 | 1 | -0/+4 | |
|/ / | | | | | | | (seems a connection failure does not throw an exception) | |||||
* | | The other half of the asset fix. Implement an exponentially incrementing ↵ | Tom Grimshaw | 2010-06-29 | 1 | -11/+88 | |
| | | | | | | | | retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-25 | 1 | -7/+22 | |
|\ \ | |/ | ||||||
| * | * SimianAssetServiceConnector Delete() was expecting the wrong type of ↵ | John Hurliman | 2010-06-24 | 1 | -7/+22 | |
| | | | | | | | | | | | | response, reporting false errors * Fixed a typo in a WebUtil error message | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-22 | 2 | -4/+30 | |
|\ \ | |/ | ||||||
| * | * Fixed SimianGrid map tile uploads not having any objects in the images | John Hurliman | 2010-06-22 | 2 | -4/+30 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-16 | 1 | -7/+46 | |
|\ \ | |/ |