aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmergeMelanie2011-10-121-1/+1
|\
| * Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in ↵Justin Clark-Casey (justincc)2011-10-071-1/+1
| | | | | | | | OpenSim.ini.example
* | Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmergeMelanie2011-10-122-9/+8
|\ \ | |/
| * Clarify explanation of DeleteScriptsOnStartup switch in [XEngine].Justin Clark-Casey (justincc)2011-10-042-9/+8
| |
* | Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmergeMelanie2011-10-112-19/+38
|\ \ | |/
| * copy config information on allow/disallow individual os functions into ↵Justin Clark-Casey (justincc)2011-09-302-19/+38
| | | | | | | | | | | | OpenSim.ini.example I this is generally useful rather than a 'default' setting
* | Merge commit '6d0978594d1eca9ae56584afe38215f4262256e7' into bigmergeMelanie2011-10-111-0/+0
|\ \ | |/
| * remove unused postgresql dllJustin Clark-Casey (justincc)2011-09-301-0/+0
| |
* | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmergeMelanie2011-10-111-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-301-0/+8
| | | | | | | | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled
* | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmergeMelanie2011-10-112-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 Argus2011-09-242-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 bigmergeMelanie2011-10-112-5/+13
|\ \ | |/
| * Clarify explanation of the "DeleteScriptsOnStartup" config switch and add ↵Justin Clark-Casey (justincc)2011-09-242-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 bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * Correct asset id of library default iris texture.Justin Clark-Casey (justincc)2011-09-231-1/+1
| | | | | | | | For this change to show up you will need to clear viewer cache.
* | Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmergeMelanie2011-10-111-0/+2
|\ \ | |/
| * Add BulletSim physics option details to OpenSim.ini.example. Marked as in ↵Justin Clark-Casey (justincc)2011-09-171-0/+2
| | | | | | | | development and experimental.
* | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmergeMelanie2011-10-111-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 BulletSJustin Clark-Casey (justincc)2011-09-171-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 bigmergeMelanie2011-10-111-0/+6
|\ \ | |/
| * Add back BulletSPlugin.dll.config that I somehow managed to delete today in ↵Justin Clark-Casey (justincc)2011-09-171-0/+6
| | | | | | | | a00327d
* | Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * Revert "uncomment Standalone config in OpenSim.ini.example."Justin Clark-Casey (justincc)2011-09-171-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 bigmergeMelanie2011-10-111-6/+94
|\ \ | |/
| * Fix base_hair.dat to actually contain the base hair asset rather than base ↵Justin Clark-Casey (justincc)2011-09-161-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 bigmergeMelanie2011-10-111-6/+0
|\ \ | |/
| * Fix build errors on Windows by adding missing OpenSim.Services.Base referencejustincc2011-09-161-6/+0
| |
* | Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmergeMelanie2011-10-113-2/+21
|\ \ | |/
| * On standalone, by default create the necessary minimum body parts and ↵Justin Clark-Casey (justincc)2011-09-163-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 bigmergeMelanie2011-10-119-140/+215
|\ \ | |/
| * Write code to create minimum necessary body parts/clothing and avatar ↵Justin Clark-Casey (justincc)2011-09-159-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.Tom2011-09-141-1/+1
|\ \ | |/
| * uncomment Standalone config in OpenSim.ini.example.Justin Clark-Casey (justincc)2011-09-121-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 1Tom2011-09-0428-612/+329
|\ \ | |/
| * Fixed BulletSim config files for Linux *.so libraries.Snoopy Pfeffer2011-09-041-2/+2
| |
| * also get "nant clean" to remove old .mdb from .exe and .dllJustin Clark-Casey (justincc)2011-08-301-0/+0
| |
| * Hack our copy of Prebuild to just delete the dlls and mdbs in Physics, so as ↵Justin Clark-Casey (justincc)2011-08-301-0/+0
| | | | | | | | to leave the new config file
| * BulletSim: update values in OpenSimDefaults.ini to the same as defaults in ↵Robert Adams2011-08-301-4/+4
| | | | | | | | the source.
| * BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read.Robert Adams2011-08-304-0/+0
| |
| * BulletSim: add mesh representation. Use meshes for static objects and switch ↵Robert Adams2011-08-264-1/+3
| | | | | | | | to hulls for physical objects.
| * Merge branch 'master' into bulletsimMic Bowman2011-08-263-16/+19
| |\
| | * minor: Add explanative text for the new currency parameter. Convert some ↵Justin Clark-Casey (justincc)2011-08-223-16/+19
| | | | | | | | | | | | tabs to spaces
| * | Merge branch 'master' into bulletsimMic Bowman2011-08-197-7/+19
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| | * Get rid of HttpServer.dll to avoid confusion since we use ↵Justin Clark-Casey (justincc)2011-08-191-0/+0
| | | | | | | | | | | | HttpServer_OpenSim.dll (patched version) instead
| | * Add terminating quotes to http addresses in [SimulatorFeatures] section of ↵Justin Clark-Casey (justincc)2011-08-161-2/+2
| | | | | | | | | | | | | | | | | | OpenSim.ini.example. As per http://opensimulator.org/mantis/view.php?id=5638. Thanks DutchGlory.
| | * Change the default standalone asset cache to be the Flotsam asset cache ↵Justin Clark-Casey (justincc)2011-08-162-5/+7
| | | | | | | | | | | | | | | | | | | | | (with memory caching not enabled). This matches the GridCommon setting and is the best tested setting. It appears to work fine on standalone. Also, add information that the flotsam asset cache is the recommended cache, since it is most used and actively maintained.
| | * minor: Add warning to OpenSim.ini.example about bullet plugins not working ↵Justin Clark-Casey (justincc)2011-08-161-0/+1
| | | | | | | | | | | | right now, pending the new plugin
| | * Added optional Login Service parameter "Currency" to be able to change the ↵Snoopy Pfeffer2011-08-143-0/+6
| | | | | | | | | | | | currency name shown in the viewer.
| | * WorldMap: Added map item for Land-for-Sale. Implemented backlist item ↵Snoopy Pfeffer2011-08-141-0/+3
| | | | | | | | | | | | timeouts (default 10 minutes; see also new config file setting BlacklistTimeout) and removing backlisted neigboring regions that have been restarted from the blacklist.
generated by cgit v1.1 at 2024-12-14 23:26:56 +0000