aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-302-2/+1
|\
| * Deleted Check4096 from Robust.ini.exampleDiva Canto2010-08-261-2/+1
| * Rename Newtonsoft.Json.dll to properly reflect its actual assembly nameJustin Clark-Casey (justincc)2010-08-261-0/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-251-1/+1
|\ \ | |/
| * TypoDiva Canto2010-08-241-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-231-1/+1
|\ \ | |/
| * Correct a minor typoMelanie2010-08-211-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-213-79/+89
|\ \ | |/
| * OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section ...Ai Austin2010-08-201-27/+32
| * Make some small corrections to ini.example file changes. These are not funct...Justin Clark-Casey (justincc)2010-08-202-20/+12
| * Robust.ini.example and Robust.HG.ini.example default: corrected comment about...Ai Austin2010-08-202-40/+53
| * Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie2010-08-201-0/+6
* | Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie Thielker2010-08-201-0/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-1945-0/+338
|\ \ | |/
| * One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943.Diva Canto2010-08-182-327/+327
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-181-0/+0
| |\
| * | Add textures no longer shipped with newer viewers to OpenSim's standard asset...Justin Clark-Casey (justincc)2010-08-1845-0/+338
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-181-0/+0
|\ \ \ | | |/ | |/|
| * | * Updated to OpenMetaverse.StructuredData.dll that includes implicit typecast...John Hurliman2010-08-171-0/+0
| * | Updated to new OpenMetaverse.StructuredData.dll that includes implicit typecastsJohn Hurliman2010-08-171-0/+0
| |/
* | Add ini.example section for the MOTD module.meta72010-08-111-0/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-083-0/+46
|\ \ | |/
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-081-0/+7
| |\
| | * In my crusade against facelights, I am striking the killing blow. Add aMelanie2010-08-081-0/+7
| * | Enabled GridInfoServiceInConnector for standalones.Diva Canto2010-08-083-0/+46
| |/
* | In my crusade against facelights, I am striking the killing blow. Add aMelanie Thielker2010-08-081-0/+7
* | Delete some files from bin that should not have been committedMelanie Thielker2010-08-074-9058/+0
* | and another one...sacha2010-08-074-0/+9058
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-076-27547/+27552
|\ \ | |/
| * Added Check4096 config var under [GridService], at the request of many. Chang...Diva Canto2010-08-062-0/+5
| * These files want to be committed -- white space weirdness.Diva Canto2010-08-064-27547/+27547
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-0610-24305/+27552
|\ \ | |/
| * Merge branch 'moap'Justin Clark-Casey (justincc)2010-08-0610-24305/+27552
| |\
| | * Update OpenMetaverse libraries to r3287 + r3294 (removal of OpenMetaverse.Htt...Justin Clark-Casey (justincc)2010-07-279-24305/+27547
| | * provide config option for media on a primJustin Clark-Casey (justincc)2010-07-261-0/+5
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Kitto Flora2010-08-042-0/+3
|\ \ \
| * \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-041-0/+0
| |\ \ \
| | * | | Revert "re-Add the XML configuration loader dll. It's gone AWOL in a cleanup,...Melanie2010-08-041-0/+0
| * | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-041-0/+0
| |\ \ \ \ | | |/ / /
| | * | | re-Add the XML configuration loader dll. It's gone AWOL in a cleanup, butMelanie2010-08-041-0/+0
| | |/ /
| * | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-042-0/+3
| |\ \ \ | | |/ /
| | * | Bug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, but...Diva Canto2010-08-032-0/+3
| | |/
* | | Fixes fresh hollowed prim collision shape.Kitto Flora2010-08-042-41/+0
|/ /
* | Add config option securePermissionsLoading which will stop the region from lo...Tom2010-08-011-0/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-291-0/+3
|\ \ | |/
| * Adding sample configuration to previous patchMelanie2010-07-221-0/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-201-1/+1
|\ \ | |/
| * Fixes mantis #4872. Port for GridInfo was wrong in Robust.HG.ini.exampleDiva Canto2010-07-151-1/+1
* | XGitminster: Update config options; commitFrameInterval -> CommitInterval and...Tom Grimshaw2010-07-171-2/+5
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-141-12/+0
|\ \ | |/