aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-042-0/+9
|\ | | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * Add WebProfiles config to other config exampleBlueWall2012-03-041-0/+3
| |
| * Merge branch 'master' into v3_supportBlueWall2012-03-024-0/+0
| |\
| * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_supportBlueWall2012-02-2522-14/+14
| |\ \
| * | | 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
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-03-034-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | Remove more now unused third party libraries.Justin Clark-Casey (justincc)2012-03-014-0/+0
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-02-2522-14/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
| * | 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.
* | Merge branch 'master' into careminsterMelanie2012-02-216-0/+0
|\ \ | |/ | | | | Conflicts:
| * 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.
* | Merge branch 'ubitwork'Melanie2012-02-193-0/+7
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
| * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-152-6/+14
| |\ \
| * | | files need to run UbitODE in linux ( untested )UbitUmarov2012-02-083-0/+7
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-02-182-0/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * | 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.
* | | Merge branch 'master' into careminsterMelanie2012-02-152-6/+14
|\ \ \ | |/ / | | / | |/ |/|
| * 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
* | Merge branch 'master' into careminsterMelanie2012-02-071-4/+3
|\ \ | |/
| * 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.
* | Merge branch 'master' into careminsterMelanie2012-02-071-0/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * 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)
* | Merge branch 'master' into careminsterMelanie2012-02-052-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * 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
* | Merge branch 'master' into careminsterMelanie2012-02-041-0/+33
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * 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.
* | Merge branch 'master' into careminsterMelanie2012-01-311-0/+33
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * 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.
* | Merge branch 'master' into careminsterMelanie2012-01-291-1/+1
|\ \ | |/
| * 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>
* | Merge branch 'master' into careminsterMelanie2012-01-282-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * 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
* | Merge branch 'master' into careminsterMelanie2012-01-265-2/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Update BulletSim.dll with some interface changes and tuning (see ↵Robert Adams2012-01-255-2/+3
| | | | | | | | opensim-libs). Change BSScene to use new interface.
* | Merge branch 'master' into careminsterMelanie2012-01-211-0/+6
|\ \ | |/
| * 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
| |\
generated by cgit v1.1 at 2024-11-15 00:14:47 +0000