| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 3 | -6/+91 |
|\ |
|
| * | Make User Agent Service and Login Service separable. | Diva Canto | 2010-09-04 | 1 | -0/+4 |
| * | Added XFF header processing. Untested, for lack of proxy. | Diva Canto | 2010-09-03 | 1 | -0/+3 |
| * | In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod ra... | Justin Clark-Casey (justincc) | 2010-09-03 | 1 | -1/+1 |
| * | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to... | John Hurliman | 2010-09-03 | 2 | -5/+83 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 2 | -2/+1 |
|\ \
| |/ |
|
| * | Deleted Check4096 from Robust.ini.example | Diva Canto | 2010-08-26 | 1 | -2/+1 |
| * | Rename Newtonsoft.Json.dll to properly reflect its actual assembly name | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -0/+0 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Typo | Diva Canto | 2010-08-24 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Correct a minor typo | Melanie | 2010-08-21 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 3 | -79/+89 |
|\ \
| |/ |
|
| * | OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section ... | Ai Austin | 2010-08-20 | 1 | -27/+32 |
| * | Make some small corrections to ini.example file changes. These are not funct... | Justin Clark-Casey (justincc) | 2010-08-20 | 2 | -20/+12 |
| * | Robust.ini.example and Robust.HG.ini.example default: corrected comment about... | Ai Austin | 2010-08-20 | 2 | -40/+53 |
| * | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie | 2010-08-20 | 1 | -0/+6 |
* | | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie Thielker | 2010-08-20 | 1 | -0/+6 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-19 | 45 | -0/+338 |
|\ \
| |/ |
|
| * | One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943. | Diva Canto | 2010-08-18 | 2 | -327/+327 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-18 | 1 | -0/+0 |
| |\ |
|
| * | | Add textures no longer shipped with newer viewers to OpenSim's standard asset... | Justin Clark-Casey (justincc) | 2010-08-18 | 45 | -0/+338 |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 1 | -0/+0 |
|\ \ \
| | |/
| |/| |
|
| * | | * Updated to OpenMetaverse.StructuredData.dll that includes implicit typecast... | John Hurliman | 2010-08-17 | 1 | -0/+0 |
| * | | Updated to new OpenMetaverse.StructuredData.dll that includes implicit typecasts | John Hurliman | 2010-08-17 | 1 | -0/+0 |
| |/ |
|
* | | Add ini.example section for the MOTD module. | meta7 | 2010-08-11 | 1 | -0/+4 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-08 | 3 | -0/+46 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-08 | 1 | -0/+7 |
| |\ |
|
| | * | In my crusade against facelights, I am striking the killing blow. Add a | Melanie | 2010-08-08 | 1 | -0/+7 |
| * | | Enabled GridInfoServiceInConnector for standalones. | Diva Canto | 2010-08-08 | 3 | -0/+46 |
| |/ |
|
* | | In my crusade against facelights, I am striking the killing blow. Add a | Melanie Thielker | 2010-08-08 | 1 | -0/+7 |
* | | Delete some files from bin that should not have been committed | Melanie Thielker | 2010-08-07 | 4 | -9058/+0 |
* | | and another one... | sacha | 2010-08-07 | 4 | -0/+9058 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 6 | -27547/+27552 |
|\ \
| |/ |
|
| * | Added Check4096 config var under [GridService], at the request of many. Chang... | Diva Canto | 2010-08-06 | 2 | -0/+5 |
| * | These files want to be committed -- white space weirdness. | Diva Canto | 2010-08-06 | 4 | -27547/+27547 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 10 | -24305/+27552 |
|\ \
| |/ |
|
| * | Merge branch 'moap' | Justin Clark-Casey (justincc) | 2010-08-06 | 10 | -24305/+27552 |
| |\ |
|
| | * | Update OpenMetaverse libraries to r3287 + r3294 (removal of OpenMetaverse.Htt... | Justin Clark-Casey (justincc) | 2010-07-27 | 9 | -24305/+27547 |
| | * | provide config option for media on a prim | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -0/+5 |
* | | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Kitto Flora | 2010-08-04 | 2 | -0/+3 |
|\ \ \ |
|
| * \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-04 | 1 | -0/+0 |
| |\ \ \ |
|
| | * | | | Revert "re-Add the XML configuration loader dll. It's gone AWOL in a cleanup,... | Melanie | 2010-08-04 | 1 | -0/+0 |
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-04 | 1 | -0/+0 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | re-Add the XML configuration loader dll. It's gone AWOL in a cleanup, but | Melanie | 2010-08-04 | 1 | -0/+0 |
| | |/ / |
|
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-04 | 2 | -0/+3 |
| |\ \ \
| | |/ / |
|
| | * | | Bug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, but... | Diva Canto | 2010-08-03 | 2 | -0/+3 |
| | |/ |
|
* | | | Fixes fresh hollowed prim collision shape. | Kitto Flora | 2010-08-04 | 2 | -41/+0 |
|/ / |
|
* | | Add config option securePermissionsLoading which will stop the region from lo... | Tom | 2010-08-01 | 1 | -0/+3 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-29 | 1 | -0/+3 |
|\ \
| |/ |
|