aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix merge issuesMelanie2011-02-071-3/+0
* Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+3
|\
| * Fix a typo in the QUERYACCESS method nameMelanie2011-02-051-1/+1
| * Fix up QueryAccess to also check parcelsMelanie2011-01-281-1/+8
* | Fix up QueryAccess to also check parcelsMelanie2011-01-281-1/+8
* | Make bans work for teleport. Now teleport will complete block if the userMelanie2011-01-271-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-237-21/+10
|\ \ | |/
| * remove some mono compiler warnings and unnecessary dictionary instantiationsJustin Clark-Casey (justincc)2011-01-217-20/+10
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-182-8/+26
|\ \ | |/
| * Account for some component along the way lower-casing the HTTP header keys. (...Diva Canto2011-01-172-21/+23
| * Brute force debug for XFF issueDiva Canto2011-01-171-0/+7
| * More debug messages to help track the XFF header problem.Diva Canto2011-01-172-0/+5
| * Improved debug messages to track what is going on with the XFF headerDiva Canto2011-01-092-0/+4
| * Implement Scope ID lookup on GetLandData. Stacked regions were not handledMelanie2011-01-031-1/+1
* | Implement Scope ID lookup on GetLandData. Stacked regions were not handledMelanie2010-12-311-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-091-20/+31
|\ \ | |/
| * Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+26
| * Added an exception handler on CreateObject handler, just in case there's an e...Diva Canto2010-12-071-20/+31
* | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+26
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-1/+9
|\ \ | |/
| * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-052-2/+9
| |\
| * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-231-2/+4
| |\ \
| * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-214-74/+72
| |\ \ \
* | \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-032-2/+9
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ...Diva Canto2010-11-252-2/+9
| | |_|/ | |/| |
| * | | Fix more potential nullrefsMelanie2010-11-231-2/+4
| | |/ | |/|
* | | Fix more potential nullrefsMelanie2010-11-231-2/+4
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-221-0/+2
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-212-73/+64
| |\ \
| * | | Added creator info across the board -- TaskInventoryItems and InventoryItems ...Diva Canto2010-11-211-0/+2
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-211-0/+19
|\ \ \ \ | | |/ / | |/| |
| * | | Implement a method to allow regions to query the gridwide FreeswitchMelanie2010-11-211-0/+19
| * | | Start implementing Freeswitch in ROBUSTMelanie2010-11-212-73/+45
| |/ /
| * | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-1/+6
* | | Start implementing Freeswitch in ROBUSTMelanie2010-11-212-73/+45
* | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-1/+6
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-2/+0
|\ \ \ | |/ /
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-9/+1
| |/
| * * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-211-2/+8
| * * more url / hg cleanupJonathan Freedman2010-10-111-0/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-0/+2
|\ \
| * | * more url / hg cleanupJonathan Freedman2010-10-201-0/+2
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-061-1/+1
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-041-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-046-10/+68
|\ \ | |/
| * Made the home agent handler check for xff if behind a proxy.Diva Canto2010-10-032-3/+23
| * Made the Gatekeeper proxy-able.Diva Canto2010-10-033-3/+28
| * Added viewer's channel, mac, and id0 to agent circuit data. Also moved client...Diva Canto2010-10-032-4/+17
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-021-6/+20
|\ \ | |/
| * adding -logconfig to Robust.exeBlueWall2010-10-011-6/+20