| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -0/+2 |
|\ |
|
| * | Propagate our teleport flags on logins | BlueWall | 2012-02-18 | 1 | -0/+2 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 1 | -0/+3 |
|\ \
| |/ |
|
| * | Multiple lines in welcome message use '\n' in the welcome message to | nebadon | 2011-11-05 | 1 | -0/+3 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -4/+23 |
|\ \
| |/ |
|
| * | minor: comment out friends number logging from login for now | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -1/+1 |
| * | Added optional Login Service parameter "Currency" to be able to change the cu... | Snoopy Pfeffer | 2011-08-14 | 2 | -2/+21 |
| * | Get rid of AvatarAppearance.Owner to simplify the code. | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-13 | 1 | -0/+8 |
|\ \
| |/ |
|
| * | People are bound to forget the '/' at the end of MapTileURL, so let's correct... | Diva Canto | 2011-06-12 | 1 | -0/+8 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 2 | -14/+48 |
|\ \
| |/ |
|
| * | Add alternate region handling for url based logins as found in login to "home... | BlueWall | 2011-06-01 | 1 | -3/+15 |
| * | Added necessary code to drop inventory on hg friends using the profile window... | Diva Canto | 2011-05-24 | 1 | -10/+20 |
| * | More on HG Friends. Added Delete(string, string) across the board. Added secu... | Diva Canto | 2011-05-22 | 1 | -1/+1 |
| * | HG Friends working to some extent: friendships offered and accepted correctly... | Diva Canto | 2011-05-19 | 1 | -1/+13 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 2 | -2/+0 |
|\ \
| |/ |
|
| * | Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll | Diva Canto | 2011-04-30 | 2 | -2/+0 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -3/+37 |
|\ \
| |/ |
|
| * | Thank you Snoopy for a patch that adds some filtering to client versions allo... | Diva Canto | 2011-04-27 | 1 | -3/+37 |
| * | Also set Godlike flag. Might be useful | Melanie | 2011-01-27 | 1 | -0/+2 |
| * | Add TeleportFlags.ViaRegionID to the flags sent on login when the region | Melanie | 2011-01-27 | 1 | -8/+13 |
* | | Also set Godlike flag. Might be useful | Melanie | 2011-01-27 | 1 | -0/+2 |
* | | Add TeleportFlags.ViaRegionID to the flags sent on login when the region | Melanie | 2011-01-27 | 1 | -8/+13 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 2 | -2/+2 |
|\ \
| |/ |
|
| * | Prune some of the excess logging for client logins. | Justin Clark-Casey (justincc) | 2011-01-18 | 2 | -2/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -0/+5 |
|\ \
| |/ |
|
| * | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks comman... | Diva Canto | 2010-12-09 | 1 | -0/+5 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 2 | -32/+4 |
|\ \
| |/ |
|
| * | Fixed some inconsistency with trailing /. Made debug messages consistent. Cha... | Diva Canto | 2010-12-05 | 1 | -2/+2 |
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 1 | -0/+16 |
| |\ |
|
| * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -10/+30 |
| |\ \ |
|
| * \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -5/+5 |
| |\ \ \ |
|
| * | | | | * a bit of additional debugging: | Jonathan Freedman | 2010-10-23 | 1 | -4/+3 |
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 1 | -0/+16 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ... | Diva Canto | 2010-11-25 | 1 | -0/+16 |
| | |_|/
| |/| | |
|
* | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to be | Melanie | 2010-11-25 | 1 | -1/+2 |
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-17 | 1 | -10/+30 |
|\ \ \ \
| |/ / / |
|
| * | | | Do not include hyperlinks in a random region search during a login. | Marck | 2010-11-13 | 1 | -10/+30 |
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -5/+5 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 1 | -5/+5 |
| |\ \ \ |
|
| | * \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... | Melanie | 2010-10-21 | 1 | -5/+5 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | | * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 1 | -5/+5 |
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -1/+28 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+28 |
| | |_|/
| |/| | |
|
| * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -6/+14 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 1 | -28/+1 |
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -28/+1 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 1 | -28/+1 |
| | |/
| |/| |
|