aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Whitespace conflictMelanie Thielker2010-08-091-4/+0
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-091-2/+6
|\
| * Make fallbacks work, the destination was never actually updated with the ↵meta72010-08-091-4/+5
| | | | | | | | | | | | fallback details. Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'careminster-presence-refactor' of ↵meta72010-08-082-5/+1
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-092-5/+1
| |\ \ | | |/
| | * Remove "Could not authorize your session into the region" message in favorMelanie2010-08-092-5/+1
| | | | | | | | | | | | of sending back the actual error message provided by the sim.
| | * Add search URL to Login ServiceMelanie2010-08-072-2/+20
| | |
* | | Make fallbacks work, the destination was never actually updated with the ↵meta72010-08-081-6/+7
|/ / | | | | | | fallback details.
* | Add search URL to Login ServiceMelanie2010-08-072-2/+20
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-075-5/+113
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-075-5/+113
| |\
| | * Added Check4096 config var under [GridService], at the request of many. ↵Diva Canto2010-08-064-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 ↵Marck2010-08-065-4/+103
| | | | | | | | | | | | | | | | | | range. Also add GetHyperlinks() to the grid service.
| * | Correct display of landmark about info. Also correct region maturity ratingMelanie Thielker2010-08-072-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 ratingMelanie Thielker2010-08-072-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-refactorMelanie2010-08-063-20/+54
|\ \ | |/
| * Allow the trash folder itself to be passed to PurgeFolderMelanie Thielker2010-08-061-0/+3
| |
| * Better debug messagesDiva Canto2010-08-041-5/+19
| |
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-031-1/+2
| |\
| * | Further bug fixing, still related to the issue earlier.Diva Canto2010-08-031-3/+17
| | |
| * | Another bug fixed. Same issue.Diva Canto2010-08-031-1/+2
| | |
| * | this is so bad, brain is beyond fried. must stop.Diva Canto2010-08-031-1/+1
| | |
| * | sigh. fried brain.Diva Canto2010-08-031-1/+1
| | |
| * | One more buglet related to the issue at hand.Diva Canto2010-08-031-1/+1
| | |
| * | One more thing related to the previous commit. Must avoid all in-process ↵Diva Canto2010-08-031-10/+15
| | | | | | | | | | | | remote calls.
* | | Allow the trash folder itself to be passed to PurgeFolderMelanie Thielker2010-08-061-0/+3
| | |
* | | reverese my last commitsacha2010-08-061-4/+2
| | |
* | | Allowing the expected purge trash folder...sacha2010-08-061-2/+3
| | | | | | | | | | | | Please validate !!!
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-042-56/+63
|\ \ \ | | |/ | |/|
| * | Allow specifying default region flags. Correct a typo.Melanie Thielker2010-08-041-1/+2
| |/
| * Bug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, ↵Diva Canto2010-08-032-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 Thielker2010-08-041-1/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-012-25/+24
|\ \ | |/
| * White space from previous commit.Diva Canto2010-07-311-21/+21
| |
| * Implemented console command "show hyperlinks".Marck2010-07-311-25/+24
| |
| * Bug fix: make m_HypergridLinker static.Diva Canto2010-07-301-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-313-8/+11
|\ \ | |/
| * Changed the way HG client verification is done: now transforming local and ↵Diva Canto2010-07-302-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 parsingJohn Hurliman2010-07-291-0/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-292-2/+73
|\ \ | |/
| * Add some optionsMelanie2010-07-241-0/+11
| |
| * Fix some inventory issuesMelanie2010-07-241-0/+29
| |
| * Add sending of the avatar interests and configuration of the profilesMelanie2010-07-221-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-refactorMelanie2010-07-141-2/+4
|\ \ | |/
| * Fix obvious bug in XInventoryService.GetFolderItems() which was preventing ↵Justin Clark-Casey (justincc)2010-07-141-2/+4
| | | | | | | | the iar module from being able to save single item iars
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-081-1/+5
|\ \ | |/
| * Don't include hyperlinks as neighbors, even if grid operators have done the ↵Diva Canto2010-07-051-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 Grimshaw2010-07-042-3/+22
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-07-042-3/+22
| |\ \ | | |/
| | * Fixes mantis #4835Diva Canto2010-07-031-1/+1
| | |