| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 24 | -549/+674 |
| |\ | |||||
| | * | Forward-port a small improvement to the land out connector | Melanie Thielker | 2010-08-21 | 1 | -1/+2 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-20 | 6 | -20/+65 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-20 | 1 | -27/+32 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-20 | 4 | -70/+109 |
| | | |\ \ | |||||
| | | * | | | Unit test breakage fix. | Diva Canto | 2010-08-20 | 6 | -20/+65 |
| | | | | | | |||||
| | * | | | | Some code cleanup for console command "create region". | Marck | 2010-08-20 | 2 | -31/+36 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | Make region name an optional command parameter. Avoid question for region name if it has already been specified. Extend help text. | ||||
| | * | | | OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section ↵ | Ai Austin | 2010-08-20 | 1 | -27/+32 |
| | | |/ | |/| | | | | | | | away from end and correction of typo "fro" (fixes Mantis 4833) | ||||
| | * | | Make some small corrections to ini.example file changes. These are not ↵ | Justin Clark-Casey (justincc) | 2010-08-20 | 2 | -20/+12 |
| | | | | | | | | | | | | | functional changes. | ||||
| | * | | Robust.ini.example and Robust.HG.ini.example default: corrected comment ↵ | Ai Austin | 2010-08-20 | 2 | -40/+53 |
| | | | | | | | | | | | | | about realm for UserAccountService to state default is useraccount, and include default realm commented out in every case | ||||
| | * | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-20 | 1 | -9/+9 |
| | | | | |||||
| | * | | Some code cleanup for console command alert. | Marck | 2010-08-20 | 1 | -9/+43 |
| | |/ | | | | | | | | | | | Made parsing of parameters more robust. Allow general alerts without specifying keyword 'general'. Extended help texts. | ||||
| | * | Cleaned up a few more things related to incoming agents. | Diva Canto | 2010-08-20 | 1 | -45/+42 |
| | | | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-20 | 11 | -164/+213 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-19 | 1 | -1/+6 |
| | | |\ | |||||
| | | * | | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵ | Diva Canto | 2010-08-19 | 4 | -119/+48 |
| | | | | | | | | | | | | | | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general. | ||||
| | | * | | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 8 | -47/+167 |
| | | | | | | | | | | | | | | | | | untested. Committing to move to my other computer. | ||||
| | * | | | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie | 2010-08-20 | 3 | -17/+60 |
| | | |/ | |/| | | | | | | | to make it more configurable. | ||||
| * | | | Forward-port a small improvement to the land out connector | Melanie Thielker | 2010-08-21 | 1 | -1/+2 |
| | | | | |||||
| * | | | Someone from germany broke the build :P mentioning no names | meta7 | 2010-08-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use the database mthod directly to delete items in a single sql swoop | Melanie Thielker | 2010-08-20 | 1 | -11/+1 |
| | | | | |||||
| * | | | Delete items as well as folders in XInventoryService.PurgeFolder - this ↵ | meta7 | 2010-08-20 | 1 | -0/+11 |
| | | | | | | | | | | | | | should make emptying the trash work properly. | ||||
| * | | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-20 | 86 | -4357/+423 |
| |\ \ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie Thielker | 2010-08-20 | 3 | -21/+59 |
| | | | | | | | | | | | | | | | | | to make it more configurable. | ||||
| | * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-19 | 1 | -40/+28 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-19 | 1 | -40/+28 |
| | | |\ \ | | | |/ | |||||
| | | | * | These files want to be committed. This time I'm doing it separately from ↵ | Diva Canto | 2010-08-19 | 2 | -327/+327 |
| | | | | | | | | | | | | | | | | | other commits. | ||||
| | | | * | Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943." | Diva Canto | 2010-08-19 | 3 | -367/+355 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way. This reverts commit e47608fc62647a28be91dd9caf6e446826fdb54c. | ||||
| | | * | | Short-circuit the grid server lookup for RequestSimulatorData if the region | Melanie Thielker | 2010-08-19 | 1 | -1/+6 |
| | | |/ | | | | | | | | | | info is requested for is the local region | ||||
| | * | | Short-circuit the grid server lookup for RequestSimulatorData if the region | Melanie Thielker | 2010-08-19 | 1 | -1/+6 |
| | | | | | | | | | | | | | info is requested for is the local region | ||||
| | * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-19 | 82 | -4362/+389 |
| | |\ \ | | |/ | |||||
| | | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-19 | 36 | -4334/+11 |
| | | |\ | |||||
| | | | * | Improve some logging in LandConnector | Justin Clark-Casey (justincc) | 2010-08-19 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | This also eliminate the last 'OGS1' logging message (in this case, an erroneous one) | ||||
| | | | * | remove ancient and unused OpenSim.GridLaunch GUI code. | Justin Clark-Casey (justincc) | 2010-08-19 | 34 | -4327/+0 |
| | | | | | | | | | | | | | | | | | Current policy is that OpenSim core is not the place for gui tools | ||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-19 | 3 | -355/+367 |
| | | | |\ | |||||
| | | | * | | minor: Correct string format in "Can't find linkset root prim" message | Justin Clark-Casey (justincc) | 2010-08-19 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Skip conversion if fields that are null in the database. This may | Melanie Thielker | 2010-08-19 | 1 | -0/+4 |
| | | | |/ | | |/| | | | | | | | | | uncover errors elsewhere. | ||||
| | | * | | One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943. | Diva Canto | 2010-08-18 | 3 | -355/+367 |
| | | |/ | | | | | | | | | | (Files .xml and .txt also want to be committed) | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-18 | 17 | -30/+83 |
| | | |\ | |||||
| | | | * | Prevent a bad cast in llCreateLink(). | Melanie Thielker | 2010-08-18 | 1 | -1/+5 |
| | | | | | |||||
| | | * | | Add textures no longer shipped with newer viewers to OpenSim's standard ↵ | Justin Clark-Casey (justincc) | 2010-08-18 | 45 | -0/+338 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asset library These are appropriately licensed and include plant, tree and miscellaneous textures (face target crosshairs, etc). Many thanks to Nebadon for sourcing and packaging these. | ||||
| | * | | | Revert "Adding Group managment to the offline system" | Melanie Thielker | 2010-08-19 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7c673c79d4c52fa14ed803754a18d56bcf54ad87. That module only handles text IM | ||||
| | * | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-08-19 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | | * | | | Adding Group managment to the offline system | sacha | 2010-08-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | Sending a group invite is offlined now | ||||
| | * | | | | Skip conversion if fields that are null in the database. This may | Melanie Thielker | 2010-08-19 | 1 | -0/+4 |
| | |/ / / | | | | | | | | | | | | | uncover errors elsewhere. | ||||
| | * | | | Prevent a bad cast in llCreateLink(). | Melanie Thielker | 2010-08-18 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Get maturity level from access number. This addresses mantis #269 | meta7 | 2010-08-20 | 1 | -0/+6 |
| |/ / / | |||||
| * | | | Fix a typecasting issue in llList2Float. This addresses mantis #262 | meta7 | 2010-08-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-18 | 69 | -600/+1126 |
| |\ \ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 66 | -596/+1122 |
| | |\ \ \ | | | |/ | | |/| | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |