| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-03-28 | 1 | -1/+24 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | ||||
| | * | minor: Fix usage error message for "debug eq" console command | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -1/+1 |
| | | | |||||
| | * | Add "show eq" console command to show numbers of messages in agent event queues. | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -0/+23 |
| | | | | | | | | | For debugging purposes. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-26 | 1 | -0/+6 |
| |\ \ | |/ | |||||
| | * | Implement a pref to turn on the simulator ExportSupported feature entry. | Melanie | 2013-03-26 | 1 | -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 PermissionMask | Melanie | 2013-03-26 | 2 | -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 PermissionMask | Melanie | 2013-03-24 | 1 | -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 careminster | Melanie | 2013-03-13 | 1 | -1/+3 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs | ||||
| | * | minor: Remove mono compiler warnings in EventQueueTests | Justin Clark-Casey (justincc) | 2013-03-11 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-05 | 1 | -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-04 | 1 | -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 careminster | Melanie | 2013-03-03 | 3 | -2/+9 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | ||||
| | * | | Make a viewer sent XML error prettier | Melanie | 2013-03-03 | 1 | -0/+4 |
| | | | | |||||
| | * | | The viewer tries to parse the error message body to LLSD - give it some. | Melanie | 2013-02-24 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix an issue where the viewer would request the seed cap before | Melanie | 2013-02-18 | 1 | -0/+3 |
| | | | | | | | | | | | | | there was a handler for it. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 3 | -6/+6 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | minor: remove some mono compiler warnings in ↵ | Justin Clark-Casey (justincc) | 2013-02-20 | 2 | -5/+5 |
| | | | | | | | | | | | | | OpenSim.Region.ClientStack.Linden.Caps.dll | ||||
| | * | | Add an event and some logic to allow customizing Simulator Features by avatar | Melanie | 2013-02-14 | 1 | -4/+21 |
| | | | | |||||
| | * | | Make the sim features module register it's interface so it can be used | Melanie | 2013-02-13 | 1 | -0/+2 |
| | | | | |||||
| | * | | Plumb the path from the client to the extra physics params and back | Melanie | 2013-02-07 | 2 | -0/+28 |
| | | | | |||||
| | * | | Send the new physics params to the viewer build dialog | Melanie | 2013-02-07 | 1 | -0/+35 |
| | | | | |||||
| | * | | * the root prim was being given an OffsetPosition in addition to setting the ↵ | teravus | 2013-02-05 | 1 | -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 careminster | Melanie | 2013-02-14 | 1 | -4/+21 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Add an event and some logic to allow customizing Simulator Features by avatar | Melanie | 2013-02-14 | 1 | -4/+21 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-14 | 1 | -0/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Small fix to sim features module | Melanie | 2013-02-14 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-07 | 1 | -7/+70 |
| |\ \ \ | |/ / | |||||
| | * | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP | Melanie | 2013-02-06 | 1 | -7/+70 |
| | | | | |||||
| * | | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -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/opensim | Melanie | 2013-02-05 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Bump version and assembly version numbers from 0.7.5 to 0.7.6 | Justin Clark-Casey (justincc) | 2013-02-05 | 1 | -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. | Melanie | 2013-02-05 | 1 | -12/+27 |
| | |/ / | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-01-27 | 1 | -3/+18 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | * Handle a NRE with Baked Textures that may result in a failed appearance. ↵ | teravus | 2013-01-22 | 1 | -3/+18 |
| | | | | | | | | | | | | | This may be an issue, or it may be a symptom. | ||||
| * | | | Merge branch 'avination' | Melanie | 2013-01-19 | 1 | -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) | UbitUmarov | 2013-01-13 | 1 | -2/+8 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-10 | 1 | -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 viewers | Melanie | 2013-01-08 | 1 | -2/+20 |
| | | | | | | | | | | | | | work. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-01-10 | 2 | -4/+196 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Add the new UpdateAgentInformation cap to make maturity on more recent viewers | Melanie | 2013-01-08 | 1 | -0/+19 |
| | | | | | | | | | | | | | work. | ||||
| | * | | * Fixed a bug that replayed old cached appearance when changing outfits | teravus | 2012-12-31 | 1 | -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) | ||||
| | * | | * This finishes the implementation of AgentCachedTexture. Requires the ↵ | teravus | 2012-12-29 | 1 | -4/+136 |
| | | | | | | | | | | | | | XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-12-18 | 2 | -2/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Prevent a failed user relogi from throwing exceptions in poll services | Melanie | 2012-12-14 | 2 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| / | |/ | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | ||||
| | * | Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵ | Justin Clark-Casey (justincc) | 2012-11-24 | 1 | -1/+1 |
| | | | | | | | | | automatically turns off any logging enabled between tests | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-11-22 | 1 | -7/+35 |
| |\ \ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |