aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵Justin Clark-Casey (justincc)2013-09-021-5/+6
| | | | | | | | | | | | | | | | | | | | allow different default regions for HG and direct grid logins. This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators. This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified then existing configured defaults will still work. Immediate use is for conference where we need to be able to specify different defaults However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
* | Merge branch 'master' into careminsterMelanie2013-09-014-1/+5
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-251-1/+1
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-08-241-0/+4
| | |\
| | * | Whitespace fubar.Diva Canto2013-08-241-1/+1
| | | |
| * | | Rename pCampbot.ini -> pCampBot.ini (and example file) to be consistent with ↵Justin Clark-Casey (justincc)2013-08-231-0/+0
| | |/ | |/| | | | | | | other capitalizations of pCampBot
| * | Make it possible to adjust the pCampbot login delay via the [BotManager] ↵Justin Clark-Casey (justincc)2013-08-221-0/+4
| |/ | | | | | | LoginDelay parameter of pCampbot.ini
| * * Fix some threading issues in BulletXNA (the managed bullet library), this ↵teravus2013-08-202-0/+0
| | | | | | | | | | | | should better allow you to run it in multiple region scenarios (but why would you really want to do that?) Source in OpenSimLibs. * Fixed a null ref during shutdown.
* | Merge branch 'master' into careminsterMelanie2013-08-141-0/+15
|\ \ | |/
| * Add pCampbot RequestObjectTextures ini setting to control whether textures ↵Justin Clark-Casey (justincc)2013-08-141-2/+8
| | | | | | | | are requested for received objects.
| * Add a SendAgentUpdates setting to a new pCampbot.ini.example file which can ↵Justin Clark-Casey (justincc)2013-08-131-0/+9
| | | | | | | | | | | | control whether bots send agent updates pCampbot.ini.example is used by copying to pCampbot.ini, like other ini files
* | Merge branch 'master' into careminsterMelanie2013-08-111-0/+7
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add parameter and explanation of ManagedStats return to OpenSimDefaults.ini.Robert Adams2013-08-081-0/+7
| | | | | | | | | | Add 'callback' query parameter to managed stats return to return function form of JSON data.
* | Merge branch 'master' into careminsterMelanie2013-08-078-7/+123
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Amend to last commit -- remove the obsolete var from OpenSim.ini.exampleDiva Canto2013-08-071-4/+0
| |
| * Add the experimental ability to dump stats (result of command "show stats ↵Justin Clark-Casey (justincc)2013-08-064-1/+99
| | | | | | | | | | | | | | | | all") to file OpenSimStats.log every 5 seconds. This can currently only be activated with the console command "debug stats record start". Off by default. Records to file OpenSimStats.log for simulator and RobustStats.log for ROBUST
| * Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to be ↵Justin Clark-Casey (justincc)2013-08-022-0/+22
| | | | | | | | | | | | | | | | manually forced in a new [SimulationService] config setting. This is for testing and debugging purposes to help determine whether a particular issue may be teleport related or not "SIMULATION/0.2" (the newer teleport protocol) remains the default. If the source simulator only implements "SIMULATION/0.1" this will correctly allow fallback to the older protocol. Specifying "SIMULATION/0.1" will force the older, less efficient protocol to always be used.
| * Move experimental attachments throttling further down the chain so that ↵Justin Clark-Casey (justincc)2013-08-021-2/+2
| | | | | | | | multiple attachments changes (e.g. change outfit) are also throttled
* | Merge branch 'master' into careminsterMelanie2013-08-011-0/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Add experimental "debug attachments throttle <ms>" setting (command line) ↵Justin Clark-Casey (justincc)2013-08-011-0/+7
| | | | | | | | | | | | | | | | | | | | and ThrottlePer100PrimsRezzed in [Attachments] in config This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously. It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in. Default is 0 (no throttling). "debug attachments <level>" changes to "debug attachments log <level>" which controls logging. A logging level of 1 will show the throttling performed if applicable. Also adds "debug attachments status" command to show current throttle and debug logging levels.
* | Merge branch 'master' into careminsterMelanie2013-08-011-0/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * Add the Simian service config to the GridCommon exampleMic Bowman2013-07-311-0/+9
| |
* | Merge branch 'master' into careminsterMelanie2013-07-296-4/+14
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that ↵Diva Canto2013-07-284-0/+4
| | | | | | | | handler from both Groups modules in core, and replaced them with an operation on IGroupsModule.
| * Clarification on docs of .ini.examples for Groups (again)Diva Canto2013-07-272-2/+3
| |
| * Clarifications on documentation of Group configsDiva Canto2013-07-272-4/+9
| |
* | Merge branch 'master' into careminsterMelanie2013-07-251-0/+7
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs bin/OpenSimDefaults.ini
| * Added config var that we all thought was already there: see_into_region. ↵Diva Canto2013-07-241-0/+3
| | | | | | | | (Note: different from the defunct see_into_neighboring_sim, which used to control the process from the other end). This enables child agents in neighbors for which the root agent doesn't have permission to be in.
* | Merge branch 'master' into careminsterMelanie2013-07-241-0/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Improvements to the ServiceThrottleModule: added a category and an itemid to ↵Diva Canto2013-07-161-0/+4
| | | | | | | | the interface, so that duplicate requests aren't enqueued more than once.
* | Merge branch 'master' into careminsterMelanie2013-07-182-25/+51
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * Document obscure Groups config related to the user level required for ↵Diva Canto2013-07-141-0/+4
| | | | | | | | creating groups
| * BulletSim: implementation of linkset center-of-mass.Robert Adams2013-07-061-19/+37
| | | | | | | | | | | | Default off, for the moment, until more testing. Add separate thread and center-of-mass flags to OpenSimDefaults.ini. Clean up comments in OpenSimDefaults.ini.
| * Some consistency fixes for the ini to stop parser breakageBlueWall2013-07-041-6/+10
| |
* | Merge branch 'master' into careminsterMelanie2013-06-302-0/+12
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Add IMG_BLOOM1.jp2 to standard asset set, which is used in stars.Justin Clark-Casey (justincc)2013-06-282-0/+12
| | | | | | | | | | | | | | This makes stars appear more realistically rather than as massive chunks due to the missing IMG_BLOOM1 asset from the viewer. Thanks to YoshikoFazuku for supplying the star asset which I then uploaded via a viewer and extracted as JPEG2000. Thanks also to Ai Austin for helping this process along. See http://opensimulator.org/mantis/view.php?id=6691 for more details.
* | Merge branch 'master' into careminsterMelanie2013-06-183-0/+9
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * Add Option: ClassifiedFeeBlueWall2013-06-133-0/+9
| | | | | | | | | | | | | | | | | | | | Add option to set minimum fee for publishing classifieds. Many viewers have a hard coded minimum of 50, which makes publishing classifieds fail where grids have no economy. This allows the grid to set the minimum fee to a suitable value for their operation. The option is located in the [LoginService] section and defaults to 0. The value is sent as "classified_fee" in the login response.
| * Revert "Add option to set minimum fee for classified ads"BlueWall2013-06-113-16/+1
| | | | | | | | This reverts commit 90097de6c3cf58989698b37c89baa8268895fc86.
| * Add option to set minimum fee for classified adsBlueWall2013-06-113-1/+16
| | | | | | | | | | | | | | Upcoming phoenix-firestorm (4.4.1) adds a configurable option for setting the minimum price for publishing a classified ad. http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/43415d69b048
* | Merge branch 'avination-current' into careminsterMelanie2013-06-061-0/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | Update HTTP serverMelanie2013-06-041-0/+0
| | |
| * | Add the enter uuid dialogMelanie2013-04-221-0/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-047-34/+83
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * | New HttpServer_OpenSim.dll with increased limits on number of connections, ↵Diva Canto2013-06-041-0/+0
| | | | | | | | | | | | requests, etc.
| * | Adding back the BasicProfileModuleBlueWall2013-05-311-2/+2
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-306-2/+58
| |\ \
| | * | UserProfilesBlueWall2013-05-306-2/+58
| | | | | | | | | | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
| * | | BulletSim: remove unuseful BulletSim parameters from OpenSimDefaults.ini andRobert Adams2013-05-301-32/+25
| |/ / | | | | | | | | | replace with things someone might actually want to tune (avatar height, ...).
* | | Merge branch 'master' into careminsterMelanie2013-05-304-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
generated by cgit v1.1 at 2024-12-25 23:40:44 +0000