| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 5 | -7/+20 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | 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 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | minor: remove some mono compiler warnings in ↵ | Justin Clark-Casey (justincc) | 2013-02-20 | 2 | -5/+5 | |
| | | | | | | | | | | | | | OpenSim.Region.ClientStack.Linden.Caps.dll | |||||
| | * | | Fix shape parameters sent for meshes tosupport the full number of faces | Melanie | 2013-02-16 | 1 | -0/+8 | |
| | | | | ||||||
| | * | | 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 | 3 | -4/+83 | |
| | | | | ||||||
| | * | | 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 | |
| | | | | ||||||
| | * | | 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 'avination' into careminster | Melanie | 2013-02-07 | 2 | -115/+70 | |
| |\ \ \ | |/ / | ||||||
| | * | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP | Melanie | 2013-02-06 | 2 | -115/+70 | |
| | | | | ||||||
| | * | | * 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 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 2 | -2/+2 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | 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 | 2 | -2/+2 | |
| | |\ \ | ||||||
| | | * | | Bump version and assembly version numbers from 0.7.5 to 0.7.6 | Justin Clark-Casey (justincc) | 2013-02-05 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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' 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 | 4 | -43/+66 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | 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. | |||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2013-01-16 | 1 | -2/+8 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2013-01-16 | 1 | -2/+12 | |
| | | |\ \ | ||||||
| | | * | | | try to patch getmesh Throttle (test) | UbitUmarov | 2013-01-13 | 1 | -2/+8 | |
| | | | | | | ||||||
| | * | | | | 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 '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 | 3 | -20/+314 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |