| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 14 | -13/+273 |
| |\ | | | | | | | | | | | | | | | 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 'dynamic-attributes2' | Justin Clark-Casey (justincc) | 2013-02-05 | 1 | -0/+260 |
| | |\ | |||||
| | | * | Added DynAttrs to the serialized XML format of prims. When copying prims, ↵ | Oren Hurvitz | 2013-01-25 | 1 | -2/+24 |
| | | | | | | | | | | | | | use deep copy for DynAttrs. | ||||
| | | * | Stopped storing dynamic attributes in the PrimShape | Oren Hurvitz | 2013-01-25 | 1 | -7/+0 |
| | | | | |||||
| | | * | Changed DAMap to be the container of "data stores", which are OSDMaps. Store ↵ | Oren Hurvitz | 2013-01-25 | 1 | -20/+84 |
| | | | | | | | | | | | | | names must have at least 4 characters. | ||||
| | | * | Lock DAMap rather than encapsulated OSDMap | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -17/+18 |
| | | | | | | | | | | | | | This allows external lockers to preserve atomicity of dynamic attribute changes | ||||
| | | * | Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵ | Justin Clark-Casey (justincc) | 2013-01-25 | 3 | -82/+176 |
| | | | | | | | | | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual | ||||
| | | * | Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLite | Justin Clark-Casey (justincc) | 2013-01-25 | 2 | -0/+86 |
| | | | | |||||
| | * | | Bump version and assembly version numbers from 0.7.5 to 0.7.6 | Justin Clark-Casey (justincc) | 2013-02-05 | 13 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+26 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵ | Jak Daniels | 2013-01-30 | 1 | -1/+26 |
| | |/ | | | | | | | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2013-01-24 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Implement get version RemoteAdmin call | Melanie | 2013-01-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-23 | 2 | -4/+23 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2013-01-23 | 3 | -7/+22 |
| | |\ \ | |||||
| | * | | | Add additional return status | BlueWall | 2013-01-23 | 2 | -4/+23 |
| | | | | | | | | | | | | | | | | | Adding additional return status for JsonRpcMethod. Now returns true/false | ||||
| * | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2013-01-23 | 3 | -5/+58 |
| |\ \ \ \ | | | | | | | | | | | | | | | | careminster | ||||
| | * \ \ \ | Merge branch 'avination' | Melanie | 2013-01-19 | 3 | -5/+58 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs | ||||
| | | * | | | Merge remote-tracking branch 'remotes/origin/avination' into teravuswork | teravus | 2013-01-16 | 2 | -8/+6 |
| | | |\ \ \ | |||||
| | | | * | | | Add a way to put things at the front of the queue for any throttle group. | Melanie | 2013-01-16 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | | | * | | | Complete removal of the now unused state queue | Melanie | 2013-01-16 | 1 | -4/+0 |
| | | | | | | | |||||
| | | * | | | | * Document the additional Visual Params of newer browsers in ↵ | teravus | 2013-01-14 | 1 | -1/+52 |
| | | |/ / / | | | | | | | | | | | | | | | | AvatarAppearance.VPElement so it can be easily looked up in code/module | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2013-01-23 | 1 | -2/+7 |
| |\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs | ||||
| | * | | | Assign the SmartThreadPool name in the constructor | Oren Hurvitz | 2013-01-19 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | This is required because some threads are created in the constructor, so assigning the name afterwards would be too late. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-01-19 | 2 | -4/+14 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | ||||
| | * | | | Explicitly stop PollServiceRequestManager() rather than relying on its ↵ | Justin Clark-Casey (justincc) | 2013-01-19 | 2 | -5/+15 |
| | | |/ | |/| | | | | | | | | | | | | | destructor. Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503 | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-18 | 1 | -0/+12 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2013-01-17 | 1 | -4/+0 |
| | |\ \ | |||||
| | * | | | Add utility function to clamp a vector to a maximum magnitude. | Robert Adams | 2013-01-17 | 1 | -0/+12 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-01-16 | 1 | -4/+0 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | 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 | 5 | -0/+298 |
| | |\ \ \ | | |/ / | |||||
| | * | | | Complete removal of the now unused state queue | Melanie | 2013-01-16 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster | Melanie | 2013-01-16 | 5 | -0/+298 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Add Json-Rpc 2.0 To Registered Handlers | BlueWall | 2013-01-15 | 5 | -0/+298 |
| | |/ / | | | | | | | | | | | | | Added registration json-rpc handlers in the http server. Covers version 2.0 See: http://www.jsonrpc.org/specification | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-10 | 1 | -5/+5 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | | revert accidental change to MemoryWatchdog stat calculation in previous b1b4687 | Justin Clark-Casey (justincc) | 2013-01-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add "show script timers" command to show script timers. For debug purposes. | Justin Clark-Casey (justincc) | 2013-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | Also, "show sensors" changes to "show script sensors". | ||||
| | * | | minor: Remove unnecessary commented out code from last commit c28a2f05 and ↵ | Justin Clark-Casey (justincc) | 2013-01-09 | 1 | -4/+1 |
| | | | | | | | | | | | | | fix up code comment | ||||
| | * | | minor: make spacing consistent in console help output | Justin Clark-Casey (justincc) | 2013-01-09 | 1 | -3/+6 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-01-10 | 2 | -3/+129 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | * This finishes the implementation of AgentCachedTexture. Requires the ↵ | teravus | 2012-12-29 | 2 | -3/+129 |
| | | | | | | | | | | | | | 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 | 4 | -2/+48 |
| |\ \ \ | |/ / | |||||
| | * | | check land permitions on sit target for unscripted sits | UbitUmarov | 2013-01-03 | 1 | -0/+1 |
| | | | | |||||
| | * | | * Partial Commit for Avatar Appearance to include the functionality of ↵ | teravus | 2012-12-21 | 3 | -2/+47 |
| | | | | | | | | | | | | | Cached Bakes. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 2 | -7/+19 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | Allow registering regions whose names are equivalent under LIKE but not ↵ | Oren Hurvitz | 2013-01-02 | 1 | -0/+11 |
| | | | | | | | | | | | | | truly equal | ||||
| | * | | Fix indenting on ConsoleDisplayTable, align indenting on "show animations" ↵ | Justin Clark-Casey (justincc) | 2013-01-02 | 1 | -2/+3 |
| | | | | | | | | | | | | | console command | ||||
| | * | | minor: Allow objects to be added directly to a row on a ConsoleDisplayTable ↵ | Justin Clark-Casey (justincc) | 2013-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | rather than having to ToString() them first | ||||
| | * | | Add "show animations" console command for debug purposes. | Justin Clark-Casey (justincc) | 2013-01-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | This shows the current animation sequence and default anims for avatars. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-02 | 1 | -1/+2 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |