aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)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
| | | | | | | | 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-202-20/+12
| | | | | | | | functional changes.
| * Robust.ini.example and Robust.HG.ini.example default: corrected comment ↵Ai Austin2010-08-202-40/+53
| | | | | | | | about realm for UserAccountService to state default is useraccount, and include default realm commented out in every case
| * Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie2010-08-201-0/+6
| | | | | | | | to make it more configurable.
* | Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie Thielker2010-08-201-0/+6
| | | | | | | | to make it more configurable.
* | 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
| | | | | | | | (Files .xml and .txt also want to be committed)
| * 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 ↵Justin Clark-Casey (justincc)2010-08-1845-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.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-181-0/+0
|\ \ \ | | |/ | |/|
| * | * Updated to OpenMetaverse.StructuredData.dll that includes implicit ↵John Hurliman2010-08-171-0/+0
| | | | | | | | | | | | typecasts going in the other direction
| * | 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
| | | | | | | | | | | | | | | | | | DisableFacelights option to OpenSim.ini to finally kill those immersion- breaking, silly vanity lights that destroy nighttime RP. Girls, you look just fine without them. Guys, you too. Thank you. Melanie has left the building.
| * | 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
| | | | | | | | | | | | DisableFacelights option to OpenSim.ini to finally kill those immersion- breaking, silly vanity lights that destroy nighttime RP. Girls, you look just fine without them. Guys, you too. Thank you. Melanie has left the building.
* | 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. ↵Diva Canto2010-08-062-0/+5
| | | | | | | | | | | | Changed the iteration that Marck had on the Hyperlinker. ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.
| * 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 ↵Justin Clark-Casey (justincc)2010-07-279-24305/+27547
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenMetaverse.Http.dll dependency) + r3378 (treat MediaPermission as a bitfield) As far as I can determine, r3287 + r3294 patch was the previous update to the OpenMetaverse libraries This change just adds r3378 to overcome problems storing media textures with certain permission combinations in inventory This is a limited change in order to isolate moap from any other possible libomv update issues An update to the forthcoming libomv 0.8.3 is expected in due course to replace this This commit also deletes OpenMetaverse.Utilities.* as it's unused (on the advice of jhurliman).
| | * provide config option for media on a primJustin Clark-Casey (justincc)2010-07-261-0/+5
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Kitto Flora2010-08-042-0/+3
|\ \ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ \ 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 ↵Melanie2010-08-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup, but" This reverts commit 9c7e35860e290e6bb77da7749d4d3b82a5c75418.
| * | | | 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
| | |/ / | | | | | | | | | | | | | | | | still needed for web-loading region configs and for loading legacy XML region files
| * | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-042-0/+3
| |\ \ \ | | |/ /
| | * | Bug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, ↵Diva Canto2010-08-032-0/+3
| | |/ | | | | | | | | | | | | | | | but it clears up the circular dependency issue between Gatekeeper and UserAgents that had made me resort to in-process remote calls, which, in turn, were hitting bugs down there somewhere in mono. NOTE: CONFIGURATION CHANGE IN ROBUST.HG.INI.EXAMPLE !!!###!!!
* | | Fixes fresh hollowed prim collision shape.Kitto Flora2010-08-042-41/+0
|/ /
* | Add config option securePermissionsLoading which will stop the region from ↵Tom2010-08-011-0/+3
| | | | | | | | loading if the specified permissions modules fail to load.
* | 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 ↵Tom Grimshaw2010-07-171-2/+5
| | | | | | | | and a new option DisableNonEssentialCommits
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-141-12/+0
|\ \ | |/