aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| * | BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOsRobert Adams2013-05-264-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which recompute GImpact shape bounding box after creation as Bullet doesn't do that itself (something it does for nearly every other shape). Now, physical prims without cuts become single mesh convex meshes. Physical prims with cuts become GImpact meshes. Meshes become a set of convex hulls approximated from the mesh unless the hulls are specified in the mesh asset data. The use of GImpact shapes should make some mechanical physics more stable.
* | | Merge branch 'master' into careminsterMelanie2013-05-244-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | BulletSim: update DLLs and SOs with version containing gImpact code.Robert Adams2013-05-214-0/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-168-12012/+11955
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Updated libopenmetaverse to a5ad7f200e9bd2e91604ba921d1db3768108686bLatif Khalifa2013-05-167-11955/+11955
| | |
| * | Removed obsolete libopenmetaverse fileLatif Khalifa2013-05-161-57/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-112-0/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * | Application support:BlueWall2013-05-092-0/+12
| | | | | | | | | | | | Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
* | | Merge branch 'master' into careminsterMelanie2013-05-081-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packet can be pulled out of LLClientView and moved to AvatarFactory. The first pass at reusing textures (turned off by default) is included. When reusing textures, if the baked textures from a previous login are still in the asset service (which generally means that they are in the simulator's cache) then the avatar will not need to rebake. This is both a performance improvement (specifically that an avatars baked textures do not need to be sent to other users who have the old textures cached) and a resource improvement (don't have to deal with duplicate bakes in the asset service cache).
* | | Merge branch 'master' into careminsterMelanie2013-05-082-2/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * | Delete "" entry for AvatarPicker cap.Diva Canto2013-05-071-1/+0
| | |
| * | Added AvatarPickerSearch capability handler.Diva Canto2013-05-072-1/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-042-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | Make default config directory "."BlueWall2013-05-012-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-012-25/+30
|\ \ \ | |/ / | | | | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * | Add information about creating a PID file for robust to the Robust.ini and ↵Justin Clark-Casey (justincc)2013-05-012-25/+30
| | | | | | | | | | | | Robust.HG.ini example files
* | | Merge branch 'master' into careminsterMelanie2013-04-255-0/+0
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-08-24 06:51:52 +0000