aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Add stack dump function that takes an alternate printer outter. I've found ↵Robert Adams2012-12-161-1/+7
| | | | | | | | | | | | that log4net can be slowish so, if one is generating A LOT of debug output, alternate printers are better
* | | Merge branch 'master' into careminsterMelanie2012-12-162-4/+26
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-12-121-4/+24
| |\ \
| | * | Add "debug script log" command to allow setting a numeric debug level on ↵Justin Clark-Casey (justincc)2012-12-121-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | individual IScriptInstances for debugging purposes. Current, state changes and event fires can be logged for individual scripts. See command help for more details.
| * | | Hide some console output when initializing addin repositoryBlueWall2012-12-111-0/+2
| |/ / | | | | | | | | | We do this in OpenSim.exe to hide output when unmanaged dll are scanned by mono addins. Libomv has hard-coded path to "." for the openjpeg libraries, causing output to the console when they are scanned. We will cover this up for now, then look at getting libomv to look for the libs outside the "." later.
* | | Merge branch 'master' into careminsterMelanie2012-12-091-0/+561
|\ \ \ | |/ /
| * | Format changeBlueWall2012-12-071-1/+1
| | | | | | | | | | | | Removed some white space in a line, looking to trigger a build
| * | Merge branch 'master' into connector_pluginBlueWall2012-12-074-22/+517
| |\ \
| * \ \ Merge branch 'master' into connector_pluginBlueWall2012-11-2547-754/+1721
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
| * \ \ \ Merge branch 'master' into connector_pluginBlueWall2012-10-2011-184/+586
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into connector_pluginBlueWall2012-10-191-0/+53
| |\ \ \ \ \
| * | | | | | Move PluginManagerBlueWall2012-10-191-0/+561
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move PluginManager out to OpenSimFramework for general use
* | | | | | | Merge branch 'master' into careminsterMelanie2012-12-074-22/+517
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | | Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the ↵Justin Clark-Casey (justincc)2012-12-071-0/+508
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aim of avoiding OpenSimulator problems due to script thread aborts. When an object is removed, its scripts are stopped and then the thread running them is aborted if stop takes too long. However, it appears that aborting a thread at just the wrong moment when it is obtaining a ReaderWriterLockSlim lock can leave this lock in an inconsistent state. One symptom of this is that mono leaps to 100% cpu and a vm thread dump reveals lots of threads waiting for a ReaderWriterLockSlim lock without any thread actually holding it. This is probably the same problem as encountered originally in commit 12cebb12 This commit looks to plaster this problem by putting lock obtaining methods inside finally blocks which should be uninterruptible by thread aborts.
| * | | | | | Remove very probably unused PrimitiveBaseShape(bool) constructor to reduce ↵Justin Clark-Casey (justincc)2012-12-051-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | code complexity
| * | | | | | Don't pointlessly set ExtraParams = byte[1] in PrimitiveBaseShape since this ↵Justin Clark-Casey (justincc)2012-12-051-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | is ignored by the ExtraParams properly anyway
| * | | | | | minor: tidy up spacing at bottom of MundaneFrameworkTestsJustin Clark-Casey (justincc)2012-12-051-6/+2
| | | | | | |
| * | | | | | In BaseHttpServer.HandleRequest(), use Culture.SetCurrentCulture() rather ↵Justin Clark-Casey (justincc)2012-12-051-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | than creating a new CultureInfo separately
* | | | | | Merge branch 'master' into careminsterMelanie2012-11-2517-193/+148
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
generated by cgit v1.1 at 2024-10-24 21:26:17 +0000