Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 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 |
|\ \ | |/ | |||||
| * | Make fallbacks work, the destination was never actually updated with the ↵ | meta7 | 2010-08-09 | 1 | -4/+5 |
| | | | | | | | | | | | | fallback details. Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-08 | 2 | -5/+1 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-09 | 2 | -5/+1 |
| |\ \ | | |/ | |||||
| | * | Remove "Could not authorize your session into the region" message in favor | Melanie | 2010-08-09 | 2 | -5/+1 |
| | | | | | | | | | | | | of sending back the actual error message provided by the sim. | ||||
| | * | Add search URL to Login Service | Melanie | 2010-08-07 | 2 | -2/+20 |
| | | | |||||
* | | | Make fallbacks work, the destination was never actually updated with the ↵ | meta7 | 2010-08-08 | 1 | -6/+7 |
|/ / | | | | | | | fallback details. | ||||
* | | Add search URL to Login Service | Melanie | 2010-08-07 | 2 | -2/+20 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 5 | -5/+113 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-07 | 5 | -5/+113 |
| |\ | |||||
| | * | Added Check4096 config var under [GridService], at the request of many. ↵ | Diva Canto | 2010-08-06 | 4 | -76/+85 |
| | | | | | | | | | | | | | | | | | | 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 | 5 | -4/+103 |
| | | | | | | | | | | | | | | | | | | range. Also add GetHyperlinks() to the grid service. | ||||
| * | | Correct display of landmark about info. Also correct region maturity rating | Melanie Thielker | 2010-08-07 | 2 | -2/+5 |
| |/ | | | | | | | | | 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 | 2 | -2/+5 |
| | | | | | | | | | | 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 | 3 | -20/+54 |
|\ \ | |/ | |||||
| * | Allow the trash folder itself to be passed to PurgeFolder | Melanie Thielker | 2010-08-06 | 1 | -0/+3 |
| | | |||||
| * | Better debug messages | Diva Canto | 2010-08-04 | 1 | -5/+19 |
| | | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-03 | 1 | -1/+2 |
| |\ | |||||
| * | | Further bug fixing, still related to the issue earlier. | Diva Canto | 2010-08-03 | 1 | -3/+17 |
| | | | |||||
| * | | Another bug fixed. Same issue. | Diva Canto | 2010-08-03 | 1 | -1/+2 |
| | | | |||||
| * | | this is so bad, brain is beyond fried. must stop. | Diva Canto | 2010-08-03 | 1 | -1/+1 |
| | | | |||||
| * | | sigh. fried brain. | Diva Canto | 2010-08-03 | 1 | -1/+1 |
| | | | |||||
| * | | One more buglet related to the issue at hand. | Diva Canto | 2010-08-03 | 1 | -1/+1 |
| | | | |||||
| * | | One more thing related to the previous commit. Must avoid all in-process ↵ | Diva Canto | 2010-08-03 | 1 | -10/+15 |
| | | | | | | | | | | | | remote calls. | ||||
* | | | Allow the trash folder itself to be passed to PurgeFolder | Melanie Thielker | 2010-08-06 | 1 | -0/+3 |
| | | | |||||
* | | | reverese my last commit | sacha | 2010-08-06 | 1 | -4/+2 |
| | | | |||||
* | | | Allowing the expected purge trash folder... | sacha | 2010-08-06 | 1 | -2/+3 |
| | | | | | | | | | | | | Please validate !!! | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-04 | 2 | -56/+63 |
|\ \ \ | | |/ | |/| | |||||
| * | | Allow specifying default region flags. Correct a typo. | Melanie Thielker | 2010-08-04 | 1 | -1/+2 |
| |/ | |||||
| * | Bug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, ↵ | Diva Canto | 2010-08-03 | 2 | -56/+63 |
| | | | | | | | | | | | | but it clears up the circular dependency issue between Gatekeeper and UserAgents that had made me resort to in-process remote calls, which, in turn, were hitting bugs down there somewhere in mono. NOTE: CONFIGURATION CHANGE IN ROBUST.HG.INI.EXAMPLE !!!###!!! | ||||
* | | Allow specifying default region flags. Correct a typo. | Melanie Thielker | 2010-08-04 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-01 | 2 | -25/+24 |
|\ \ | |/ | |||||
| * | White space from previous commit. | Diva Canto | 2010-07-31 | 1 | -21/+21 |
| | | |||||
| * | Implemented console command "show hyperlinks". | Marck | 2010-07-31 | 1 | -25/+24 |
| | | |||||
| * | Bug fix: make m_HypergridLinker static. | Diva Canto | 2010-07-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-31 | 3 | -8/+11 |
|\ \ | |/ | |||||
| * | Changed the way HG client verification is done: now transforming local and ↵ | Diva Canto | 2010-07-30 | 2 | -8/+9 |
| | | | | | | | | LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network. | ||||
| * | * 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 | 2 | -2/+73 |
|\ \ | |/ |