| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+42 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | Expose minimum frame time and update periods for experimentation. | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -0/+42 | |
| | | | | | | | | | | | | | | | Settings are at bottom of [Startup] in OpenSimDefaults.ini, override in OpenSim.ini to change Defaults are the same as previously. More information to come on opensim-dev shortly. Feel free to tweak but if you do please don't expect any support unless feedback on certain tweaks is explicitly requested. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 3 | -0/+3 | |
| |\ \ | |/ | ||||||
| | * | Make it possible to disable the HG linker. On non-HG systems it spits yellow | Melanie | 2011-10-12 | 3 | -0/+3 | |
| | | | | | | | | | spam, so it should not load unless HG is desired. | |||||
| * | | Disable Flotsam groups messaging module in our config base | Melanie | 2011-10-12 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | Update OpenSimDefaults.ini to make the prior state (Groups messaging enabled | Melanie | 2011-10-12 | 1 | -1/+1 | |
| | | | | | | | | | | | by default) the config default. This way it will work for current cases while allowing the use of other groups modules without config bloat. | |||||
| * | | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+5 | |
| |\ \ | |/ | ||||||
| | * | Provide a way to turn the MonitorModule on and off | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -0/+5 | |
| | | | | | | | | | Default is currently on since this is the historical setting | |||||
| * | | Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge | Melanie | 2011-10-12 | 2 | -0/+2 | |
| |\ \ | |/ | ||||||
| | * | Improve explanation of access_ip_addresses in [RemoteAdmin] to say that ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 2 | -0/+2 | |
| | | | | | | | | | there are no restrictions if not set | |||||
| * | | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge | Melanie | 2011-10-12 | 2 | -0/+8 | |
| |\ \ | |/ | ||||||
| | * | Add option to allow only explicitly listed IPs to access RemoteAdmin facilities. | Justin Clark-Casey (justincc) | 2011-10-08 | 2 | -0/+8 | |
| | | | | | | | | | | | | | Also adds password check to some functions where this was missing and fixes some parameter checking. This is a patch from http://opensimulator.org/mantis/view.php?id=5715 with a few small unrelated spacing tweaks from me. Thanks Michelle Argus. | |||||
| * | | Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in ↵ | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 | |
| | | | | | | | | | OpenSim.ini.example | |||||
| * | | Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge | Melanie | 2011-10-12 | 2 | -9/+8 | |
| |\ \ | |/ | ||||||
| | * | Clarify explanation of DeleteScriptsOnStartup switch in [XEngine]. | Justin Clark-Casey (justincc) | 2011-10-04 | 2 | -9/+8 | |
| | | | ||||||
| * | | Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmerge | Melanie | 2011-10-11 | 2 | -19/+38 | |
| |\ \ | |/ | ||||||
| | * | copy config information on allow/disallow individual os functions into ↵ | Justin Clark-Casey (justincc) | 2011-09-30 | 2 | -19/+38 | |
| | | | | | | | | | | | | | OpenSim.ini.example I this is generally useful rather than a 'default' setting | |||||
| * | | Merge commit '6d0978594d1eca9ae56584afe38215f4262256e7' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+0 | |
| |\ \ | |/ | ||||||
| | * | remove unused postgresql dll | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -0/+0 | |
| | | | ||||||
| * | | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+8 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||||
| | * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵ | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -0/+8 | |
| | | | | | | | | | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled | |||||
| * | | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge | Melanie | 2011-10-11 | 2 | -0/+9 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | |||||
| | * | Added a setting to [Startup] section of config that will allow the simulator ↵ | Kevin Houlihan & Michelle Argus | 2011-09-24 | 2 | -0/+9 | |
| | | | | | | | | | | | | | to start up with no regions configured. I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region. | |||||
| * | | Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmerge | Melanie | 2011-10-11 | 2 | -5/+13 | |
| |\ \ | |/ | ||||||
| | * | Clarify explanation of the "DeleteScriptsOnStartup" config switch and add ↵ | Justin Clark-Casey (justincc) | 2011-09-24 | 2 | -5/+13 | |
| | | | | | | | | | | | | | this to OpenSim.ini.example since it's very useful if you're not updating OpenSim from source. On reflection, "DeleteScriptsOnStartup" isn't a great name since it suggests real script deletion rather than compiled versions. | |||||
| * | | Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | Correct asset id of library default iris texture. | Justin Clark-Casey (justincc) | 2011-09-23 | 1 | -1/+1 | |
| | | | | | | | | | For this change to show up you will need to clear viewer cache. | |||||
| * | | Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+2 | |
| |\ \ | |/ | ||||||
| | * | Add BulletSim physics option details to OpenSim.ini.example. Marked as in ↵ | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -0/+2 | |
| | | | | | | | | | development and experimental. | |||||
| * | | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+1 | |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs prebuild.xml | |||||
| | * | Remove old bullet DotNET and X libraries in preparation for BulletS | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -4/+1 | |
| | | | | | | | | | | | These weren't working properly anyway. You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well. | |||||
| * | | Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+6 | |
| |\ \ | |/ | ||||||
| | * | Add back BulletSPlugin.dll.config that I somehow managed to delete today in ↵ | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -0/+6 | |
| | | | | | | | | | a00327d | |||||
| * | | Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | Revert "uncomment Standalone config in OpenSim.ini.example." | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | This reverts commit 44a491f36bbe2094634e356591381c90f87e2125. This makes packaging OpenSim slightly easier but then generates a FriendsConnector error if naively used after compilation. So let's revert to stick with the "DataStore" error for now - at least that's a known error. | |||||
| * | | Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge | Melanie | 2011-10-11 | 1 | -6/+94 | |
| |\ \ | |/ | ||||||
| | * | Fix base_hair.dat to actually contain the base hair asset rather than base ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -6/+94 | |
| | | | | | | | | | | | | | | | | | eyes by mistake. I must have had it cached last night. This now makes completely fresh avatar setups appear properly (remember to wipe viewer cache and server cache as well as database). As a bonus, eyes now appear by default too! | |||||
| * | | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge | Melanie | 2011-10-11 | 1 | -6/+0 | |
| |\ \ | |/ | ||||||
| | * | Fix build errors on Windows by adding missing OpenSim.Services.Base reference | justincc | 2011-09-16 | 1 | -6/+0 | |
| | | | ||||||
| * | | Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmerge | Melanie | 2011-10-11 | 3 | -2/+21 | |
| |\ \ | |/ | ||||||
| | * | On standalone, by default create the necessary minimum body parts and ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 3 | -2/+21 | |
| | | | | | | | | | | | | | | | clothes necessary to display a viewer 2 avatar, as implemented in c4efb97d This is controlled by the CreateDefaultAvatarEntries switch in the [UserAccountService] section of config-include/Stnadalone.ini This is left as false in grid mode | |||||
| * | | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge | Melanie | 2011-10-11 | 9 | -140/+215 | |
| |\ \ | |/ | ||||||
| | * | Write code to create minimum necessary body parts/clothing and avatar ↵ | Justin Clark-Casey (justincc) | 2011-09-15 | 9 | -140/+215 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | entries to make a newly created user appear as a non-cloud on viewer 2 Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries. Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim. Default is currently off. My intention is to switch it on for standalone shortly. This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities. Need to fix creation of suitable entries for users created as estate owners on standalone. Avatars still appear with spooky empty eyes, need to see if we can address this. This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461) which can be used. | |||||
| * | | Bring us up to date. | Tom | 2011-09-14 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | uncomment Standalone config in OpenSim.ini.example. | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -1/+1 | |
| | | | | | | | | | | | This is to make my life easier when creating releases. I think that it also gives a better story for anybody newly compiling from source. | |||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 28 | -612/+329 | |
| |\ \ | |/ | ||||||
| | * | Fixed BulletSim config files for Linux *.so libraries. | Snoopy Pfeffer | 2011-09-04 | 1 | -2/+2 | |
| | | | ||||||
| | * | also get "nant clean" to remove old .mdb from .exe and .dll | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -0/+0 | |
| | | | ||||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |