aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'avination' into careminsterMelanie2013-02-071-0/+108
|\ \ \ | | |/ | |/|
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-0/+108
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-074-1/+1145
|\ \ \ | | |/ | |/| | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| * | * Adds Websocket support to baseHttpServer and IHttpServer.cs . This ↵teravus2013-02-0717-14/+361
| |\ \ | | | | | | | | | | | | allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
| * | | This is the final commit that enables the Websocket handlerteravus2013-02-072-2/+1095
| | | |
| * | | We're not really done here.. but we're getting there. Socket Read is ↵teravus2013-02-052-1/+42
| | | | | | | | | | | | | | | | working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
* | | | Merge branch 'master' into careminsterMelanie2013-02-072-2/+29
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-062-2/+21
| |\ \ \
| | * \ \ Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-062-1/+56
| | |\ \ \
| | | * | | minor: add method doc to DAMap.ValidateKey()Justin Clark-Casey (justincc)2013-02-071-0/+4
| | | | | |
| | | * | | Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to ↵Justin Clark-Casey (justincc)2013-02-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | match Add(string key, OSDMap store)
| | * | | | WebStats will now use actual logfile as specified in OpenSim.exe.config ↵Dan Lake2013-02-061-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types
| * | | | | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-061-0/+8
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script functions. Adds JsonAttachObjectStore to associate a store identifier with an object (scripts can only access the store in their host object, this could be extended but isn't necessary for now). Note this opens a method to the DAMap OSDMap. This will be removed later, but greatly simplifies the code for now. The JsonStore and these scripts are disabled by default.
| * | | | Partial port of Avination's support for the new physics parameters.Melanie2013-02-061-0/+50
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset.
* | | | Merge branch 'master' into careminsterMelanie2013-02-0514-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-051-0/+260
| |\ \ \
| | * | | Added DynAttrs to the serialized XML format of prims. When copying prims, ↵Oren Hurvitz2013-01-251-2/+24
| | | | | | | | | | | | | | | | | | | | use deep copy for DynAttrs.
| | * | | Stopped storing dynamic attributes in the PrimShapeOren Hurvitz2013-01-251-7/+0
| | | | |
| | * | | Changed DAMap to be the container of "data stores", which are OSDMaps. Store ↵Oren Hurvitz2013-01-251-20/+84
| | | | | | | | | | | | | | | | | | | | names must have at least 4 characters.
| | * | | Lock DAMap rather than encapsulated OSDMapJustin Clark-Casey (justincc)2013-01-251-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-253-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 SQLiteJustin Clark-Casey (justincc)2013-01-252-0/+86
| | | | |
| * | | | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-0513-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 careminsterMelanie2013-01-311-1/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵Jak Daniels2013-01-301-1/+26
| |/ / | | | | | | | | | | | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Merge branch 'avination' into careminsterMelanie2013-01-241-2/+2
|\ \ \ | | |/ | |/|
| * | Implement get version RemoteAdmin callMelanie2013-01-231-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-232-4/+23
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-233-7/+22
| |\ \
| * | | Add additional return statusBlueWall2013-01-232-4/+23
| | | | | | | | | | | | | | | | Adding additional return status for JsonRpcMethod. Now returns true/false
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-01-233-5/+58
|\ \ \ \ | | | | | | | | | | | | | | | careminster
| * \ \ \ Merge branch 'avination'Melanie2013-01-193-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 teravusworkteravus2013-01-162-8/+6
| | |\ \ \
| | | * | | Add a way to put things at the front of the queue for any throttle group.Melanie2013-01-162-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 queueMelanie2013-01-161-4/+0
| | | | | |
| | * | | | * Document the additional Visual Params of newer browsers in ↵teravus2013-01-141-1/+52
| | |/ / / | | | | | | | | | | | | | | | AvatarAppearance.VPElement so it can be easily looked up in code/module
* | | | | Merge branch 'master' into careminsterMelanie2013-01-231-2/+7
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| * | | Assign the SmartThreadPool name in the constructorOren Hurvitz2013-01-191-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 careminsterMelanie2013-01-192-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-192-5/+15
| | |/ | |/| | | | | | | | | | | | | destructor. Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
* | | Merge branch 'master' into careminsterMelanie2013-01-181-0/+12
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-01-171-4/+0
| |\ \
| * | | Add utility function to clamp a vector to a maximum magnitude.Robert Adams2013-01-171-0/+12
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-01-161-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/opensimMelanie2013-01-165-0/+298
| |\ \ \ | | |/ /
| * | | Complete removal of the now unused state queueMelanie2013-01-161-4/+0
| | | |
* | | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-165-0/+298
|\ \ \ \ | | |/ / | |/| |
| * | | Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-155-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 careminsterMelanie2013-01-101-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 b1b4687Justin Clark-Casey (justincc)2013-01-101-1/+1
| | |
generated by cgit v1.1 at 2024-10-21 10:38:24 +0000