| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-03-15 | 1 | -19/+32 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Fix server statistics always reporting zero for total network bytes in/out. | Robert Adams | 2013-03-15 | 1 | -19/+32 |
| | | | | | | | | | Clean up some parameter code in Statistics.Binary. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-13 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs | ||||
| | * | minor: Remove mono compiler warning in LLClientView | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-08 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | * | * Just another one of those new packet blocks causing a null ref. ↵ | teravus | 2013-03-07 | 1 | -1/+1 |
| | | | | | | | | | Defaulting to zero length array..... | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-05 | 1 | -2/+4 |
| |\ \ | |/ | | | | | | | | | | | | | 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 | ||||
| | * | * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9 | teravus | 2013-03-04 | 1 | -2/+4 |
| | | | | | | | | | * Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter.. which adds up the Length property all of the blocks. | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2013-03-03 | 1 | -3/+14 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | ||||
| | * | | Make banking no longer break sit rotations. Fix spinning avatars. | Melanie | 2013-02-25 | 1 | -3/+6 |
| | | | | |||||
| | * | | Fix shape parameters sent for meshes tosupport the full number of faces | Melanie | 2013-02-16 | 1 | -0/+8 |
| | | | | |||||
| | * | | Revert "Push updates from keyframe directly to the front of the output queue ↵ | Melanie | 2013-02-12 | 1 | -20/+0 |
| | | | | | | | | | | | | | | | | | | | rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e. | ||||
| | * | | Revert "Use actual time dilation for unqueued updates" | Melanie | 2013-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | This reverts commit 048e904f051ccc38e7d00936b45288af3c6fc010. | ||||
| | * | | Use actual time dilation for unqueued updates | Melanie | 2013-02-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Push updates from keyframe directly to the front of the output queue rather | Melanie | 2013-02-12 | 1 | -0/+20 |
| | | | | | | | | | | | | | than through the update system. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 2 | -1/+14 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Add a method to IStatsCollector for returning stats as an OSDMap. | Robert Adams | 2013-02-20 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | Extend implementors of IStatsCollector to return an OSDMap of stats. Update UserStatsCollector and AssetStatsCollector to return both string and OSDMap data (as well as console format). | ||||
| | * | | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix shape parameters sent for meshes tosupport the full number of faces | Melanie | 2013-02-16 | 1 | -0/+8 |
| | | | | |||||
| | * | | Plumb the path from the client to the extra physics params and back | Melanie | 2013-02-07 | 1 | -4/+55 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-07 | 1 | -108/+0 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | 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 | -108/+0 |
| | | | | |||||
| | * | | * Adds a satisfying angular roll when an avatar is flying and turning. ↵ | Melanie | 2013-01-31 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff. Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| * | | | 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 | ||||
| | * | | 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. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 1 | -2/+3 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| | * | | * Adds a satisfying angular roll when an avatar is flying and turning. ↵ | teravus | 2013-01-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff. | ||||
| * | | | Merge branch 'avination' | Melanie | 2013-01-19 | 3 | -41/+58 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs | ||||
| | * | | Remove group IM test code also mentioning "OpenSimulator Testing" | Melanie | 2013-01-19 | 1 | -26/+1 |
| | | | | |||||
| | * | | Add a way to put things at the front of the queue for any throttle group. | Melanie | 2013-01-16 | 3 | -15/+57 |
| | | | | | | | | | | | | | | | | | | | | | | Adds a DoubleLocklessQueue and uses it for the outgoing buckets. Added a flag value to the Throttle Type (again) because although it's hacky, it's the best of a bad bunch to get the message through the UDP stack to where it's needed. | ||||
| | * | | Change all uses of the removed state queue to the task queue for now. | Melanie | 2013-01-16 | 1 | -5/+5 |
| | | | | |||||
| | * | | Complete removal of the now unused state queue | Melanie | 2013-01-16 | 2 | -14/+3 |
| | | | | |||||
| | * | | add some sanity checking to HandleAgentRequestSit handler | dahlia | 2013-01-13 | 1 | -2/+12 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-16 | 2 | -19/+8 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs | ||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-01-16 | 1 | -12/+3 |
| | |\ \ | |||||
| | * | | | Complete removal of the now unused state queue | Melanie | 2013-01-16 | 2 | -15/+4 |
| | | | | | |||||
| * | | | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster | Melanie | 2013-01-16 | 1 | -12/+3 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | move resit fix to ScenePresence.cs and allow for requesting sit on objects ↵ | dahlia | 2013-01-14 | 1 | -12/+3 |
| | |/ / | | | | | | | | | | other than the object currently sat on | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-13 | 1 | -2/+12 |
| |\ \ \ | |/ / | |||||
| | * | | add some sanity checking to HandleAgentRequestSit handler | dahlia | 2013-01-10 | 1 | -2/+12 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-01-10 | 1 | -16/+118 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | * Fixed a bug that replayed old cached appearance when changing outfits | teravus | 2012-12-31 | 1 | -5/+29 |
| | | | | | | | | | | | | | | | | | | | * 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 | -16/+94 |
| | | | | | | | | | | | | | 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 | 2013-01-06 | 1 | -27/+60 |
| |\ \ \ | |/ / | |||||
| | * | | * Partial Commit for Avatar Appearance to include the functionality of ↵ | teravus | 2012-12-21 | 1 | -5/+21 |
| | | | | | | | | | | | | | Cached Bakes. | ||||
| | * | | Merge branch 'avination' of careminster:/var/git/careminster into teravuswork | teravus | 2012-12-19 | 1 | -10/+55 |
| | |\ \ | |||||
| | * | | | * This is a better way to do the last commit. | teravus | 2012-12-08 | 1 | -30/+33 |
| | | | | | |||||
| | * | | | * Should promote faster self appearance. | teravus | 2012-12-07 | 1 | -19/+33 |
| | | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |