aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Add "show script timers" command to show script timers. For debug purposes.Justin Clark-Casey (justincc)2013-01-101-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-091-4/+1
| | | | | | | | | | | | fix up code comment
| * | minor: make spacing consistent in console help outputJustin Clark-Casey (justincc)2013-01-091-3/+6
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-102-3/+129
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | * This finishes the implementation of AgentCachedTexture. Requires the ↵teravus2012-12-292-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 careminsterMelanie2013-01-064-2/+48
|\ \ \ | |/ /
| * | check land permitions on sit target for unscripted sitsUbitUmarov2013-01-031-0/+1
| | |
| * | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-213-2/+47
| | | | | | | | | | | | Cached Bakes.
* | | Merge branch 'master' into careminsterMelanie2013-01-042-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 Hurvitz2013-01-021-0/+11
| | | | | | | | | | | | truly equal
| * | Fix indenting on ConsoleDisplayTable, align indenting on "show animations" ↵Justin Clark-Casey (justincc)2013-01-021-2/+3
| | | | | | | | | | | | console command
| * | minor: Allow objects to be added directly to a row on a ConsoleDisplayTable ↵Justin Clark-Casey (justincc)2013-01-021-1/+1
| | | | | | | | | | | | rather than having to ToString() them first
| * | Add "show animations" console command for debug purposes.Justin Clark-Casey (justincc)2013-01-021-4/+4
| | | | | | | | | | | | This shows the current animation sequence and default anims for avatars.
* | | Merge branch 'master' into careminsterMelanie2013-01-021-1/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: Assign names to the different SmartThreadPools for debugging purposes.Justin Clark-Casey (justincc)2013-01-011-0/+1
| | | | | | | | | | | | | | | A different approach to the patch in http://opensimulator.org/mantis/view.php?id=6462 that doesn't involve further forking of SmartThreadPool
| * | refactor: call Util.InitThreadPool() if we are initializing an uninitialized ↵Justin Clark-Casey (justincc)2013-01-011-1/+1
| | | | | | | | | | | | | | | | | | pool on first use rather than constructing it ourselves. No functional change.
* | | Merge branch 'master' into careminsterMelanie2012-12-231-0/+7
|\ \ \ | |/ /
| * | Add helper routine Util.InRange()Robert Adams2012-12-221-0/+7
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-12-184-10/+73
|\ \ \ | | |/ | |/|
| * | add a Check method to flotsamAssetCache, so to check if a asset is inUbitUmarov2012-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | cache without actually loading it. Make use limited use of it in avatarfactory textures check. Also on llclientview HandleAgentTextureCached that now should work. Other asset cache modules for now will return false, so are broken. baked textures logic still unchanged. *UNTESTED*
| * | add some default size setting and checksUbitUmarov2012-12-071-2/+20
| | |
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-073-300/+31
| | | | | | | | | | | | since at least for now seems good enought
| * | calculate avatar size on tpsUbitUmarov2012-12-071-2/+3
| | |
| * | *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-071-1/+2
| | |
| * | *TEST* add some avatar skeleton information and use it to calculate avatarUbitUmarov2012-12-072-0/+311
| | | | | | | | | | | | height and bounding box. Change LSL acording.
| * | Add a transaction ID to the money module path for llTransferLindenDollarsMelanie2012-12-031-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-181-1/+7
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
generated by cgit v1.1 at 2024-12-19 07:04:23 +0000