Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ | |/ | |||||
| * | Add some options | Melanie | 2010-07-24 | 1 | -0/+11 |
| | | |||||
| * | Fix some inventory issues | Melanie | 2010-07-24 | 1 | -0/+29 |
| | | |||||
| * | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-14 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Fix obvious bug in XInventoryService.GetFolderItems() which was preventing ↵ | Justin Clark-Casey (justincc) | 2010-07-14 | 1 | -2/+4 |
| | | | | | | | | the iar module from being able to save single item iars | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-08 | 1 | -1/+5 |
|\ \ | |/ | |||||
| * | Don't include hyperlinks as neighbors, even if grid operators have done the ↵ | Diva Canto | 2010-07-05 | 1 | -1/+5 |
| | | | | | | | | mistake of placing them as neighbors. This will not prevent further mess ups coming from that unsupported action. | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-07-04 | 2 | -3/+22 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-04 | 2 | -3/+22 |
| |\ \ | | |/ | |||||
| | * | Fixes mantis #4835 | Diva Canto | 2010-07-03 | 1 | -1/+1 |
| | | | |||||
| | * | Add MapTileURL to robust to supply the url needed by snowglobe | Melanie | 2010-07-02 | 2 | -2/+21 |
| | | | |||||
* | | | 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. |