aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-207-10/+7
|\ | | | | | | | | Conflicts: OpenSim/Framework/Util.cs
| * Move startup/shutdown command .txt files to .txt.example files to avoid ↵Justin Clark-Casey (justincc)2012-03-194-6/+6
| | | | | | | | | | | | clobbering on updates. Thanks to Whitestar in http://opensimulator.org/mantis/view.php?id=5938 for pointing out this problem.
| * Fix configuration problems where XAssetDatabasePlugin was picked up ↵Justin Clark-Casey (justincc)2012-03-193-4/+1
| | | | | | | | | | | | | | | | | | accidentally. The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up. This replaces the changes in 92b1ade. There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files. This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places). Unfortunately, you will need to rollback to an earlier database backup or reupload the textures.
* | HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-201-1/+5
|/ | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
* More on HG access control. This commit splits the UserManagementModule into ↵Diva Canto2012-03-172-0/+2
| | | | the Basic one and the HG one, so that we can do everything that needs to be done for HG ACLs to work without interfering with the vanilla opensim. For the moment, it finds foreign users who have left a trace in the region, e.g. an object. This makes it possible to ban/IM/etc these users using the regular avatar picker. TODO: contact the UAS directly given a name of the form First.Last @foo.com.
* BAD JUSTIN!Diva Canto2012-03-173-0/+3
| | | | | People using standalone in master, please update your StandaloneCommon.ini according to this change. People using robust in master, please update your Robust.HG.ini.example[.HG].ini according to this change.
* Region access control! Region operators can now specify things like ↵Diva Canto2012-03-176-6/+24
| | | | DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector.
* Terrain: added [Terrain] section with an option to load an initial flat ↵Diva Canto2012-03-162-1/+6
| | | | terrain. Default is still pinhead island. I much rather have a flat land in the beginning.
* Move startup_commands.txt.example to startup_commands.txt for consistency ↵Justin Clark-Casey (justincc)2012-03-163-4/+4
| | | | | | with the existing shutdown_commands.txt. Add comments to both files saying what they are (files that can contain console commands to execute on sim startup/shutdown) with an example.
* Remove unnecessary "backup" command in shutdown_commands.txtJustin Clark-Casey (justincc)2012-03-161-1/+2
| | | | The simulator is already doing this internally.
* Remove unused bin/ScriptEngines/Default.lslJustin Clark-Casey (justincc)2012-03-161-104/+0
| | | | | It would certainly be nice to change the default script on disk, but this is currently unused and isn't a suitable default. At this location it would also stop an easy manual deletion of script engine compiles and state.
* Change OpenSim.ini.example to reflect how to actually enable prim limits,Melanie2012-03-121-5/+1
| | | | as opposed to how it was first designed.
* Add ability to specify a default estate to be used when creating regions.Justin Clark-Casey (justincc)2012-03-101-3/+19
| | | | | | | | This is configured in the new [Estates] section of OpenSim.ini. If a default estate is configured then all new regions are automatically joined to it instead of asking the user. If the default estate does not already exist then it is created. Current default behaviour remains the same - the user is asked for estate details when necessary. Thanks to Frenando Oliveira for the patch which I adapated further.
* Add WebProfiles config to other config exampleBlueWall2012-03-041-0/+3
|
* Merge branch 'master' into v3_supportBlueWall2012-03-024-0/+0
|\
| * Remove more now unused third party libraries.Justin Clark-Casey (justincc)2012-03-014-0/+0
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_supportBlueWall2012-02-2522-14/+14
|\ \ | |/
| * Move libopenjpeg native libraries into lib32 and lib64 as appropriate.Justin Clark-Casey (justincc)2012-02-255-5/+5
| |
| * Remove some more unused Bullet libraries.Justin Clark-Casey (justincc)2012-02-253-0/+0
| |
| * Remove old libbulletnet native libraries. These are not used in the current ↵Justin Clark-Casey (justincc)2012-02-252-0/+0
| | | | | | | | generation bullet physics plugin.
| * Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as ↵Justin Clark-Casey (justincc)2012-02-259-9/+9
| | | | | | | | appropriate.
| * Remove xunit.dll, Fadd.Globalization.Yaml.dll and Fadd.dll. It looks like ↵Justin Clark-Casey (justincc)2012-02-253-0/+0
| | | | | | | | these were once connected with HttpServer.dll but are now unused.
* | V3 SupportBlueWall2012-02-221-0/+3
| | | | | | | | The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
* | Add web profile url setting to iniBlueWall2012-02-211-0/+3
|/
* Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ↵Justin Clark-Casey (justincc)2012-02-211-0/+0
| | | | bit one in lib64
* Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.Justin Clark-Casey (justincc)2012-02-212-0/+0
| | | | | This uses the same approach as ODE. radams, if this doesn't work for you please feel free to revert.
* Replace previous windows 64-bit sqlite3.dll with one from ↵Justin Clark-Casey (justincc)2012-02-211-0/+0
| | | | | | | | | http://system.data.sqlite.org/downloads/1.0.79.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.79.0.zip In this zip, it's called System.Data.SQLite.dll. We rename it to lib64/sqlite3.dll This is a little unexpected but it works. For some reason my hand-rolled one in Visual Studio 2008 did not. This is sqlite 3.7.10. Other libraries are still currently 3.7.6 but this should make no difference. This should make it possible to use OpenSim.exe on 64-bit Windows now, though currently the bullet physics plugin will still complain (can be ignored if you are not using bullet).
* Replace win 64-bit sqlite3.dll with another version, though I suspect this ↵Justin Clark-Casey (justincc)2012-02-211-0/+0
| | | | one won't work either.
* Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-212-0/+0
|
* Remove PhysXPlugin and wrappers.Justin Clark-Casey (justincc)2012-02-212-0/+0
| | | | | In over 4 years this never progressed beyond an unimplemented stub. This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
* Actually add the Windows 64-bit ode.dll file.Justin Clark-Casey (justincc)2012-02-181-0/+0
| | | | This might be why it didn't work.
* On Windows automatically load the correct native ODE library depending on ↵Justin Clark-Casey (justincc)2012-02-181-0/+0
| | | | | | | | | whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works.
* Fix: Lightshare Module(Windlight)-Region settings are not applicable for ↵PixelTomsen2012-02-142-2/+0
| | | | database sqlite mantis: http://opensimulator.org/mantis/view.php?id=5888
* Update [XEngine] AppDomainLoading advice in OpenSim.ini.exampleJustin Clark-Casey (justincc)2012-02-141-4/+9
|
* Clamp ODE character velocity. Make ODE falling character 54m/s by default.Justin Clark-Casey (justincc)2012-02-111-0/+5
| | | | | | | If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value. In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver. This also appears to be the value used on the linden lab grid. This should resolve http://opensimulator.org/mantis/view.php?id=5882
* Set UseMeshiesPhysicsMesh = true in [Mesh] by defaultJustin Clark-Casey (justincc)2012-02-071-4/+3
| | | | This means that uploaded meshes will get a physics (collision) mesh if uploaded with that option via a viewer.
* Add warning about only uncommenting EstateConnectionString if you know what ↵Justin Clark-Casey (justincc)2012-02-071-0/+2
| | | | you're doing to GridCommon.ini.example (was already in StandaloneCommon.ini.example)
* change NonPhysicalPrimMax to NonphysicalPrimMax to make this variablenebadon2012-02-042-2/+2
| | | | | work correctly, it was being ignored because of the case, this effects OpenSim.ini.example and OpenSimDefaults.ini
* Change LandDataSerializer deserialization so that in the future it won't ↵Justin Clark-Casey (justincc)2012-02-031-0/+33
| | | | | | care about extra elements or element order. This brings it into line with other deserializations such as object and will improve future backward compatibility.
* Add torture tests to test adding 10,000, 100,000 and 200,000 single prim ↵Justin Clark-Casey (justincc)2012-01-311-0/+33
| | | | | | | | | scene objects. These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature. Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc. However, data can be inconsistent due to different machine circumstances and virtual machine actions. This area is under development.
* Fix:Get embedded objects in notecard ↵PixelTomsen2012-01-291-1/+1
| | | | | | http://opensimulator.org/mantis/view.php?id=2607 Signed-off-by: nebadon <michael@osgrid.org>
* Remove accidental /user postfix from HomeURI in [HGInventoryAccessModule] in ↵Justin Clark-Casey (justincc)2012-01-282-2/+2
| | | | | | GridCommon.ini.example and from SRV_ProfileServerURI in [LoginService] in Robust.HG.ini.example As per http://opensimulator.org/mantis/view.php?id=5852, confirmed by diva via aiaustin
* Update BulletSim.dll with some interface changes and tuning (see ↵Robert Adams2012-01-255-2/+3
| | | | opensim-libs). Change BSScene to use new interface.
* Revert "Change linux, windows and mac ODE libraries to use the GIMPACT ↵Justin Clark-Casey (justincc)2012-01-207-0/+0
| | | | | | | | collider rather than OPCODE." This reverts commit 4eef6725f4116aa70de729b71d60636a7d0a68f5. Reverting for now since this fails with "terminate called after throwing an instance of 'std::bad_alloc'" on Wright Plaza instances.
* Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-171-0/+6
|\
| * Update osGetGrid**** functionsBlueWall2012-01-171-0/+6
| | | | | | | | The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section.
* | Change linux, windows and mac ODE libraries to use the GIMPACT collider ↵Justin Clark-Casey (justincc)2012-01-177-0/+0
|/ | | | | | | | | | | rather than OPCODE. As discussed on the opensim-dev mailing list, this is to avoid a demonstrated ODE collider segfault when stress-testing a simulator running more than one region using the bundled pCampbot.exe As before, the ODE revision used is r1755 - only the collider has changed. Tests so far reveal little performance change. However, if noticeable issues do arise, please report on mantis and/or the opensim-dev mailing list. The previous libraries are temporarily in bin/Physics-previous-ode-libs These can be copied back to bin if one wants to compare behaviour with the previous libraries.
* Comment out noisy log lines I accidentally included in the nant build target ↵Justin Clark-Casey (justincc)2012-01-161-1/+1
| | | | | | adjustment commit. Left in the method doc.
* Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-161-1/+1
| | | | | monocov was a code coverage attempt 3 years ago which no longer works. other removed targets have been commented out or unused for a very long time
* HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-123-6/+6
| | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.