Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors ↵ | John Hurliman | 2010-09-03 | 2 | -5/+83 | |
| | | | | | | | | | | | | to handle initialization as graceful as possible with the current broken way region module initialization is done * Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side) | |||||
* | | 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 | |
| | | | | | | | | 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 | |||||
| * | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie | 2010-08-20 | 1 | -0/+6 | |
| | | | | | | | | to make it more configurable. | |||||
* | | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie Thielker | 2010-08-20 | 1 | -0/+6 | |
| | | | | | | | | to make it more configurable. | |||||
* | | 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 | |
| | | | | | | | | (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 | 1 | -0/+0 | |
| |\ | ||||||
| * | | 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. | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 1 | -0/+0 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | * Updated to OpenMetaverse.StructuredData.dll that includes implicit ↵ | John Hurliman | 2010-08-17 | 1 | -0/+0 | |
| | | | | | | | | | | | | typecasts going in the other direction | |||||
| * | | 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 | |
| | | | | | | | | | | | | | | | | | | 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 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 | |
| | | | | | | | | | | | | 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 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. ↵ | Diva Canto | 2010-08-06 | 2 | -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 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 ↵ | Justin Clark-Casey (justincc) | 2010-07-27 | 9 | -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 prim | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -0/+5 | |
| | | | ||||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2010-08-04 | 2 | -0/+3 | |
|\ \ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * \ \ | 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 ↵ | Melanie | 2010-08-04 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup, but" This reverts commit 9c7e35860e290e6bb77da7749d4d3b82a5c75418. | |||||
| * | | | | 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 | |
| | |/ / | | | | | | | | | | | | | | | | | still needed for web-loading region configs and for loading legacy XML region files | |||||
| * | | | 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, ↵ | Diva Canto | 2010-08-03 | 2 | -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 Flora | 2010-08-04 | 2 | -41/+0 | |
|/ / | ||||||
* | | Add config option securePermissionsLoading which will stop the region from ↵ | Tom | 2010-08-01 | 1 | -0/+3 | |
| | | | | | | | | loading if the specified permissions modules fail to load. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-29 | 1 | -0/+3 | |
|\ \ | |/ | ||||||
| * | Adding sample configuration to previous patch | Melanie | 2010-07-22 | 1 | -0/+3 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Fixes mantis #4872. Port for GridInfo was wrong in Robust.HG.ini.example | Diva Canto | 2010-07-15 | 1 | -1/+1 | |
| | | ||||||
* | | XGitminster: Update config options; commitFrameInterval -> CommitInterval ↵ | Tom Grimshaw | 2010-07-17 | 1 | -2/+5 | |
| | | | | | | | | and a new option DisableNonEssentialCommits |