aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-12-071-2/+4
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Change the log level for the LOGIN DISABLED and LOGIN ENABLED messages isMic Bowman2013-11-271-2/+4
| | | | | | | | | | | | the RegionReady module to be warn so that the message will show up in the log for simulators running in a more production mode (knowing when logins are functional is useful).
* | Merge branch 'master' into careminsterMelanie2013-11-234-11/+9
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-154-11/+9
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* | Merge branch 'master' into careminsterMelanie2013-11-031-50/+122
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Added support for attachments to group notices when using Flotsam groups.Kevin Cozens2013-10-151-50/+122
| |
* | Merge branch 'master' into careminsterMelanie2013-10-062-7/+22
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
| * Add OnChatToNPC and OnInstantMessageToNPC messages to NPCAvatar to allow ↵Justin Clark-Casey (justincc)2013-10-041-6/+21
| | | | | | | | | | | | region modules to directly subscribe to chat and messages received by NPCs Currently still requires INPC from NPCModule.GetNPC() to be cast to an NPCAvatar.
* | Merge branch 'master' into careminsterMelanie2013-10-043-19/+338
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in ↵Justin Clark-Casey (justincc)2013-09-272-2/+2
| | | | | | | | the code that this is symmetric with CloseAgent()
| * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-271-1/+1
| | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
| * minor: Stop debug logging whenever an npc is moved, other npc log related ↵Justin Clark-Casey (justincc)2013-09-191-16/+15
| | | | | | | | formatting cleanups
| * BulletSim: add LSL function and plumbing for setting a springRobert Adams2013-09-111-1/+3
| | | | | | | | equilibrium point in the physics engine constraint.
| * BulletSim: add extended physics LSL constants for axis specification.Robert Adams2013-09-111-2/+14
| | | | | | | | | | Add specific error warnings for mis-matched parameter types in extended physics functions.
| * BulletSim: ability to specify groups of axis to modify in constraint ↵Robert Adams2013-09-111-1/+11
| | | | | | | | parameters that control multiple axis. Add useLinearReferenceFrameA constraint parameter.
| * BulletSim: add axis parameter for specifying enable, damping, and stiffness ↵Robert Adams2013-09-111-4/+6
| | | | | | | | for spring constraints. Renumber parameter ops since I can as no one is using them yet.
| * BulletSim: implementation of setting spring specific physical parameters. ↵Robert Adams2013-09-111-1/+5
| | | | | | | | Add setting of linkset type to physChangeLinkParams. Lots of detail logging for setting of linkset constraint parameters.
| * BulletSim: pass both root and child BSPhysObjects to Extension function. ↵Robert Adams2013-09-111-13/+17
| | | | | | | | Update routines to use the new parameters list from above change.
| * BulletSim: Extension parameters passed through the classes made to pass just ↵Robert Adams2013-09-111-5/+18
| | | | | | | | and array of objects rather than a mixture of parameters and array. Makes understanding and parsing what is being passed much easier.
| * BulletSim: add extended physics function physGetLinkType(linkNum). Add ↵Robert Adams2013-09-111-0/+19
| | | | | | | | implementation of physChangeLinkParams() in BSLinksetConstraint.
| * BulletSim: change ExtendedPhysics constants to 'const' so they can be used ↵Robert Adams2013-09-111-28/+28
| | | | | | | | as case variables in switch statements.
| * BulletSim: add physChangeLinkParams to set individual parameters on link ↵Robert Adams2013-09-111-94/+171
| | | | | | | | constraints. Not fully functional. Remove double definition of ExtendedPhysics parameters by having BulletSim reference the optional module (addition to prebuild.xml and usings).
| * BulletSim: add physChangeLinkSpring to change linkset link to be a spring ↵Robert Adams2013-09-111-3/+70
| | | | | | | | constraint. Add implementation to create spring constraint. Send up property updates for linkset children at the end of flexible linkset links. The simulator probably doesn't do the right thing yet.
| * BulletSim: initial implementation of physChangeLinkFixed that resets a ↵Robert Adams2013-09-111-1/+81
| | | | | | | | linkset's link back to a fixed, non-moving connection.
| * BulletSim: fixes for change linkset implementation of physical linksets.Robert Adams2013-09-111-1/+28
| |
* | Merge branch 'master' into careminsterMelanie2013-09-071-1/+8
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Stop "show client stats" from throwing an exception if somehow ↵Justin Clark-Casey (justincc)2013-09-041-1/+8
| | | | | | | | | | | | | | | | Scene.m_clientManager still retains a reference to a dead client. Instead, "show client stats" now prints "Off!" so that exception is not thrown and we know which entries in ClientManager are in this state. There's a race condition which could trigger this, but the window is extremely short and exceptions would not be thrown consistently (which is the behaviour observed). It should otherwise be impossible for this condition to occur, so there may be a weakness in client manager IClientAPI removal.
* | Merge branch 'master' into careminsterMelanie2013-09-011-0/+220
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Stop "handle sit user name" command from trying to sit avatars on objects ↵Justin Clark-Casey (justincc)2013-08-221-0/+3
| | | | | | | | which have sit positions but are attachments
| * Stop "sit user name" and "stand user name" console commands from trying to ↵Justin Clark-Casey (justincc)2013-08-221-2/+8
| | | | | | | | sit/stand avatars already sitting/standing
| * Add --regex options to "sit user name" and "stand user name" console ↵Justin Clark-Casey (justincc)2013-08-201-50/+81
| | | | | | | | | | | | | | commands to sit/stand many avatars at once. Currently, first name and last name are input separate but are concatenated with a space in the middle to form a regex. So to sit all bots with the first name "ima", for instance, the command is "sit user name --regex ima .*"
| * Add experimental "sit user name" and "stand user name" console commands in ↵Justin Clark-Casey (justincc)2013-08-201-0/+180
| | | | | | | | | | | | | | SitStandCommandsModule. "sit user name" will currently only sit the given avatar on prims which have a sit target set and are not already sat upon. Chiefly for debug purposes.
* | Merge branch 'master' into careminsterMelanie2013-08-132-2/+3
|\ \ | |/
| * Don't try and send group updates to NPCs via event queue, since NPCs have no ↵Justin Clark-Casey (justincc)2013-08-121-1/+0
| | | | | | | | | | | | | | event queue. I think there is an argument for sending this information to NPCs anyway since in some cases it appears a lot easier to write server-side bots by hooking into such internal events. However, would need to stop event messages building up on NPC queues if they are never retrieved.
| * Get rid of issue where removing NPCs would through an exception by routing ↵Justin Clark-Casey (justincc)2013-08-121-1/+3
| | | | | | | | | | | | close through Scene.IncomingCloseAgent() and NPCAvatar.Close() rather than directly to Scene.RemoveClient(). This exception was actually harmless since it occurred at the very last stage of the remove client process.
* | Merge branch 'master' into careminsterMelanie2013-08-071-5/+60
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * BulletSim: add implementation of 'physSetLinksetType' and 'physGetLinksetType'Robert Adams2013-08-021-5/+60
| | | | | | | | | | and processing routines in BulletSim. Add linkset rebuild/conversion routine in BSLinkset.
* | Merge branch 'master' into careminsterMelanie2013-08-011-8/+46
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * BulletSim: test method for debugging of extended physics script operations.Robert Adams2013-07-301-8/+46
| |
* | Merge branch 'master' into careminsterMelanie2013-07-294-35/+25
|\ \ | |/ | | | | | | | | 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-281-16/+6
| | | | | | | | handler from both Groups modules in core, and replaced them with an operation on IGroupsModule.
| * Commented out ChatSessionRequest capability in Vivox and Freeswitch. We ↵Diva Canto2013-07-262-18/+18
| | | | | | | | aren't processing it in any meaningful way, and it seems to get invoked everytime someone types a message in group chat.
| * Fix NPC regression test failures.Justin Clark-Casey (justincc)2013-07-261-1/+1
| | | | | | | | | | These were genuine failures caused by ScenePresence.CompleteMovement() waiting for an UpdateAgent from NPC introduction that would never come. Instead, we do not wait if the agent is an NPC.
* | Merge branch 'master' into careminsterMelanie2013-07-243-5/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks to ↵Diva Canto2013-07-212-2/+2
| | | | | | | | lkalif for telling me how to route the information. The viewer effect is under the distance filter, so only avatars with cameras < 10m away see the beams.
| * Manage AgentUpdates more sanely:Diva Canto2013-07-212-0/+2
| | | | | | | | | | | | - The existing event to scene has been split into 2: OnAgentUpdate and OnAgentCameraUpdate, to better reflect the two types of updates that the viewer sends. We can run one without the other, which is what happens when the avie is still but the user is camming around - Added thresholds (as opposed to equality) to determine whether the update is significant or not. I thin these thresholds are ok, but we can play with them later - Ignore updates of HeadRotation, which were problematic and aren't being used up stream
| * Fixed the stats in show client stats. Also left some comments with ↵Diva Canto2013-07-211-4/+4
| | | | | | | | observations about AgentUpdates.
| * Make the check as to whether any particular inbound AgentUpdate packet is ↵Justin Clark-Casey (justincc)2013-07-211-2/+2
| | | | | | | | | | | | significant much earlier in UDP processing (i.e. before we pointlessly place such packets on internal queues, etc.) Appears to have some impact on cpu but needs testing.
| * Add measure of number of inbound AgentUpdates that were seen as significant ↵Justin Clark-Casey (justincc)2013-07-211-3/+9
| | | | | | | | | | | | | | | | | | to "show client stats" (i.e. sent on for further processing instead of being discarded) Added here since it was the most convenient place Number is in the last column, "Sig. AgentUpdates" along with percentage of all AgentUpdates Percentage largely falls over time, most cpu for processing AgentUpdates may be in UDP processing as turning this off even earlier (with "debug lludp toggle agentupdate" results in a big cpu fall Also tidies up display.