aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-301-2/+2
|\ \ | |/
| * Part two of the previous commit, making IGridUserService.LoggedOut() more fle...John Hurliman2010-09-291-1/+1
| * Made IGridUserService.SetLastPosition() more flexible to allow different poss...John Hurliman2010-09-291-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-132-1/+80
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-09-121-1/+1
| * Renamed the Helo server connector to a consistent name. Added this in connect...Diva Canto2010-09-081-2/+3
| * No need for a config var for the HELO message on the server-side. It's robust.Diva Canto2010-09-081-8/+1
| * First version of the Hypergrid HELO service that will enable different backen...Diva Canto2010-09-081-0/+85
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-055-23/+43
|\ \ | |/
| * Make User Agent Service and Login Service separable.Diva Canto2010-09-043-21/+28
| * Added XFF header processing. Untested, for lack of proxy.Diva Canto2010-09-032-2/+15
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-211-0/+20
|\ \ | |/
| * Partial rewrite of client IP verification. Not completely finished yet, and u...Diva Canto2010-08-191-0/+20
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-181-4/+3
|\ \ | |/
| * minor: change some logging levelsJustin Clark-Casey (justincc)2010-08-111-3/+2