aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-242-7/+7
|\ \ | |/
| * Shell Environment Variables in configBlueWall2011-11-231-0/+0
| | | | | | | | | | | | Adding updated Nini and support to use shell environment variables in OpenSimulator configuration. Nini @ https://github.com/BlueWall/Nini-Dev
| * Move DeleteScriptsOnStartup switch from [Startup] to [XEngine] in ↵Justin Clark-Casey (justincc)2011-11-211-7/+7
| | | | | | | | | | | | OpenSim.ini.example. If anybody was changing this and wondering why there was no effect, this is why.
* | Merge branch 'master' into bigmergeMelanie2011-11-197-5491/+5492
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Enable v2/v3 map tile url setting on robust as default in configJustin Clark-Casey (justincc)2011-11-192-2/+2
| | | | | | | | This is necessary to see map tiles on v2/v3 viewers and appears to work fine
| * Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.justincc2011-11-183-5456/+5453
| | | | | | | | | | | | This will hopefully address mantis 5471, 5694 and 5718. This code is now in opensim-libs, along with Diva's slightly older patches (which were already applied to the DLLs in the opensim tree). Thanks Oren!
| * Turn the [RegionReady] module on by default and login_disable = true while ↵Justin Clark-Casey (justincc)2011-11-181-18/+21
| | | | | | | | | | | | | | | | scripts are loading. From field experience, we know that simulators can be unstable if a user logs in before the scripts have finished loading. This commit turns login_disable = true in [RegionReady] on by default which prevents this from happening. If you want the old behaviour, please copy these section from OpenSimDefaults.ini into OpenSim.ini and set login_disable = false
| * Turn SellEnabled in the [EconomyModule] on by default.Justin Clark-Casey (justincc)2011-11-172-15/+16
| | | | | | | | This only provides enough functionality to allow operations for no money (e.g. sell for $0).
* | Merge branch 'master' into bigmergeMelanie2011-11-102-6/+15
|\ \ | |/
| * Alter commit 3758306 to allow region name to be substituted within a region ↵Justin Clark-Casey (justincc)2011-11-102-6/+15
| | | | | | | | | | | | | | | | console prompt This is to allow broader subsitution in the future. Currently, the only substitions are \R (for region name) and \\ (for a single backslash) e.g. "Region (\R) " is the current and continuing default prompt This renames custom_prompt in [Startup] to ConsolePrompt
* | Merge branch 'master' into bigmergeMelanie2011-11-101-0/+5
|\ \ | |/
| * Allow custom setting for the console promptGuduleLapointe2011-11-101-0/+5
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into bigmergeMelanie2011-11-051-4/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Remove enableprejump config option and associated code as this is nowMelanie2011-11-051-4/+0
| | | | | | | | fully functional and cannot be disabled because that would break timings.
* | Merge branch 'master' into bigmergeMelanie2011-11-042-4/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Change default say distance to 20m from 30m, the same as on the big grid. ↵Justin Clark-Casey (justincc)2011-11-022-4/+4
| | | | | | | | | | | | This is to improve the migration of scripts that expect a 20m say distance. If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
* | Merge branch 'master' into bigmergeMelanie2011-11-012-3/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Removed see_into_this_sim_from_neighbor configuration option.Dan Lake2011-11-011-3/+0
| |
| * Remove unused PumaCode.SvnDotNet libraryJustin Clark-Casey (justincc)2011-10-311-0/+0
| |
* | Merge branch 'master' into bigmergeMelanie2011-10-301-0/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Add missing max_listens_per_region to [LL_Functions] config section in ↵Justin Clark-Casey (justincc)2011-10-291-0/+4
| | | | | | | | | | | | OpenSimDefaults.ini + explanation. This setting controls the maximum number of listeners in a region
* | Merge branch 'master' into bigmergeMelanie2011-10-262-0/+14
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Added optional owner classes to existing OSSL agent PermissionsMichelle Argus2011-10-262-0/+14
| | | | | | | | | | | | PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmergeMelanie2011-10-251-0/+33
|\ \ | |/
| * Add new EventQueueTests with basic test to check that adding a client ↵Justin Clark-Casey (justincc)2011-10-241-0/+33
| | | | | | | | registers an http poll
generated by cgit v1.1 at 2024-11-14 22:17:58 +0000