aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-121-1/+0
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Delete debug messageDiva Canto2013-05-101-1/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-05-081-0/+140
|\ \ | |/ | | | | | | | | | | | | 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
| * Added AvatarPickerSearch capability handler.Diva Canto2013-05-071-0/+140
| |
* | Merge branch 'master' into careminsterMelanie2013-05-011-1/+12
|\ \ | |/ | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-1/+12
| | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case.
* | Merge branch 'master' into careminsterMelanie2013-03-281-1/+24
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
| * minor: Fix usage error message for "debug eq" console commandJustin Clark-Casey (justincc)2013-03-281-1/+1
| |
| * Add "show eq" console command to show numbers of messages in agent event queues.Justin Clark-Casey (justincc)2013-03-281-0/+23
| | | | | | | | For debugging purposes.
* | Merge branch 'master' into careminsterMelanie2013-03-261-0/+6
|\ \ | |/
| * Implement a pref to turn on the simulator ExportSupported feature entry.Melanie2013-03-261-0/+6
| | | | | | | | | | | | This tells the viewer to enable the UI for export permissions. WARNING: If your inventory store contains invalid flags data, this will result in items becoming exportable! Don't turn this on in production until it's complete!
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-262-2/+4
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-4/+5
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'master' into careminsterMelanie2013-03-131-1/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * minor: Remove mono compiler warnings in EventQueueTestsJustin Clark-Casey (justincc)2013-03-111-1/+3
| |
* | Merge branch 'master' into careminsterMelanie2013-03-051-5/+5
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * Fix issue in the mesh upload flag module where the ID of the last agent to ↵Justin Clark-Casey (justincc)2013-03-041-6/+6
| | | | | | | | | | | | request the capability was always used instead of the original requesting agent for each cap. Should address http://opensimulator.org/mantis/view.php?id=6556
* | Merge branch 'avination' into careminsterMelanie2013-03-033-2/+9
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | Make a viewer sent XML error prettierMelanie2013-03-031-0/+4
| | |
| * | The viewer tries to parse the error message body to LLSD - give it some.Melanie2013-02-241-2/+2
| | |
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-0/+3
| | | | | | | | | | | | there was a handler for it.
* | | Merge branch 'master' into careminsterMelanie2013-02-223-6/+6
|\ \ \ | | |/ | |/|
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| | |
| * | minor: remove some mono compiler warnings in ↵Justin Clark-Casey (justincc)2013-02-202-5/+5
| | | | | | | | | | | | OpenSim.Region.ClientStack.Linden.Caps.dll
| * | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-141-4/+21
| | |
| * | Make the sim features module register it's interface so it can be usedMelanie2013-02-131-0/+2
| | |
| * | Plumb the path from the client to the extra physics params and backMelanie2013-02-072-0/+28
| | |
| * | Send the new physics params to the viewer build dialogMelanie2013-02-071-0/+35
| | |
| * | * the root prim was being given an OffsetPosition in addition to setting the ↵teravus2013-02-051-1/+1
| | | | | | | | | | | | position when creating the root prim. The offset position caused the positioning code to re-move the root prim when you selected it and released it.
* | | Merge branch 'avination' into careminsterMelanie2013-02-141-4/+21
|\ \ \ | | |/ | |/|
| * | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-141-4/+21
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-02-141-0/+2
|\ \ \ | |/ /
| * | Small fix to sim features moduleMelanie2013-02-141-0/+2
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-02-071-7/+70
|\ \ \ | |/ /
| * | Rename Bounciness to RestitutionMelanie2013-02-071-1/+1
| | |
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-7/+70
| | |
* | | Rename Bounciness to RestitutionMelanie2013-02-071-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-051-1/+1
| |\ \
| | * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
| * | | Try to fix uploaded mesh rotations - code from Avination code base.Melanie2013-02-051-12/+27
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2013-01-271-3/+18
|\ \ \ | | |/ | |/|
| * | * Handle a NRE with Baked Textures that may result in a failed appearance. ↵teravus2013-01-221-3/+18
| | | | | | | | | | | | This may be an issue, or it may be a symptom.
* | | Merge branch 'avination'Melanie2013-01-191-2/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
| * | try to patch getmesh Throttle (test)UbitUmarov2013-01-131-2/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-101-1/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Add the new UpdateAgentInformation cap to make maturity on more recent viewersMelanie2013-01-081-2/+20
| | | | | | | | | | | | work.
* | | Merge branch 'avination' into careminsterMelanie2013-01-102-4/+196
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Add the new UpdateAgentInformation cap to make maturity on more recent viewersMelanie2013-01-081-0/+19
| | | | | | | | | | | | work.
| * | * Fixed a bug that replayed old cached appearance when changing outfitsteravus2012-12-311-41/+82
| | | | | | | | | | | | | | | | | | * Added suser(bad client) DOS protection by limiting the max cacheitems to the maximum sane amount. * Prevents potential numerous loops from running amok and index errors if the client purposely provides bad cache info. * If the XBakes service wasn't running, the SetAvatarAppearance routine would crash when contacting the XBakes service even though it was in a Try/Catch for the appropriate error type. It only properly error handles with the type Exception :(. (commented on that because it's unusual)