aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\
| | * 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
* | Merge branch 'master' into careminsterMelanie2012-01-124-9/+9
|\ \ | |/
| * 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.
| * Correcting ini.example were permissionmodules uses komma instead of space as ↵Michelle Argus2012-01-121-3/+3
| | | | | | | | separator
* | Merge branch 'master' into careminsterMelanie2012-01-101-5/+0
|\ \ | |/
| * Remove DEBUG optionBlueWall2012-01-101-5/+0
| | | | | | | | Remove DEBUG option from OpenSim.ini.example as it is handled in the console now with "debug teleport"
* | Merge branch 'master' into careminsterMelanie2012-01-101-0/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add some run-time debugging supportBlueWall2012-01-091-0/+6
| | | | | | | | | | | | Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful. Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
* | Merge branch 'master' into careminsterMelanie2012-01-061-11/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
| * eliminate a few tabs from OpenSimDefaults.iniJustin Clark-Casey (justincc)2012-01-061-10/+10
| |
| * Add disabled Cap_FetchInventory2 = "" reference to [ClientStack.LindenCaps] ↵Justin Clark-Casey (justincc)2012-01-061-3/+4
| | | | | | | | in line with all the other ones that are there
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Update C5.dll to version 1.1.1 from 1.1.0Justin Clark-Casey (justincc)2012-01-031-0/+0
| | | | | | | | | | C5 is a collections library and can be found at http://www.itu.dk/research/c5/ This is used in the UDP texture (image) sending code.
* | Merge branch 'master' into careminsterMelanie2012-01-024-3/+5
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * Bring back the Hyperlinker to the Robust console. Moved the config to ↵Diva Canto2011-12-304-3/+5
| | | | | | | | [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis.
* | Merge branch 'master' into careminsterMelanie2011-12-281-0/+0
|\ \ | |/
| * Add Copy task to Prebuild.exe (vsxxxx targets)BlueWall2011-12-251-0/+0
| | | | | | | | | | | | | | <Files> <Match pattern="*.cs" recurse="true"/> <Match pattern="../bin/MyConfig.xml" buildAction="Copy" recurse="false" destination="$(OutputPath)" /> </Files>
* | Merge branch 'master' into careminsterMelanie2011-12-221-0/+5
|\ \ | |/
| * Make it possible to force all prims to be phantom via the collidable_prim ↵Justin Clark-Casey (justincc)2011-12-221-0/+5
| | | | | | | | | | | | | | | | | | boolean setting in the OpenSim.ini config [Startup] section. Naturally, default is true. When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom. This setting is for test purposes. This switch does not affect the collision of avatars with the terrain.
* | Merge branch 'master' into careminsterMelanie2011-12-181-1/+4
|\ \ | |/
| * Add more documentation to EstateConnectorString in StandaloneCommon.ini.exampleJustin Clark-Casey (justincc)2011-12-171-1/+4
| |
* | Merge branch 'master' into careminsterMelanie2011-12-143-6/+0
|\ \ | |/
| * Get rid of the 'lolcat' library asset.Justin Clark-Casey (justincc)2011-12-122-6/+0
| | | | | | | | This was both unused and an invalid jpeg2000 texture from way back in 2008
| * Remove long unused libdb_dotNET43.dllJustin Clark-Casey (justincc)2011-12-121-0/+0
| |
* | Set adaptive throttles false by default because it doesn't play nice with AVNMelanie2011-12-091-1/+1
| | | | | | | | code
* | Merge branch 'master' into bigmergeMelanie2011-12-091-0/+33
|\ \ | |/
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-081-0/+33
| | | | | | | | This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-085-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Update libomv to 0.9.1BlueWall2011-12-074-0/+0
| |
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-021-1/+1
| |\
| * | Make fix to Nini for null references in some cases.BlueWall2011-11-291-0/+0
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-12-051-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | change misleading login = http://127.0.0.1:9000/ in GridInfoService in ↵Justin Clark-Casey (justincc)2011-12-031-1/+1
| |/ | | | | | | Robust.ini.example to 8002
* | Merge branch 'master' into bigmergeMelanie2011-11-281-7/+10
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Implement the FetchInventoryDescendents2 capability using the same code as ↵Justin Clark-Casey (justincc)2011-11-251-4/+7
| | | | | | | | | | | | WebFetchInventoryDescendents. Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-251-3/+3
| |
generated by cgit v1.1 at 2024-10-26 13:18:55 +0000