aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-053-1/+145
|\ | | | | | | | | | | | | | | 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-052-0/+144
| |\
| | * Added unit tests for Dynamic AttributesOren Hurvitz2013-01-251-0/+37
| | |
| | * Disabled DAExampleModuleOren Hurvitz2013-01-251-5/+13
| | |
| | * Changed DAMap to be the container of "data stores", which are OSDMaps. Store ↵Oren Hurvitz2013-01-251-12/+13
| | | | | | | | | | | | names must have at least 4 characters.
| | * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵Justin Clark-Casey (justincc)2013-01-251-1/+1
| | | | | | | | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
| | * Add DAExampleModule to demonstrate dynamic attributesJustin Clark-Casey (justincc)2013-01-251-0/+98
| | | | | | | | | | | | | | | | | | This module demonstrates that we can add an arbitrary persisted value to SOP without any changes to core code. Every time the object is moved, the move record is updated and the users in the scene alerted The number of moves is persisted over server restarts in sqlite
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-02-043-22/+44
|\ \ \ | |/ /
| * | Log missing assets on "fcache assets" found. This ignores references found ↵Justin Clark-Casey (justincc)2013-02-021-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | by scanning LSL/notecard files since these are the source of false positives. This also changes UuidGatherer to reutn an AssetType.Unknown for embedded script/lsl references instead of Texture, since these are often not textures. This is added to help people in determining when they have missing assets such as textures, etc. In this case, one wants to run "fcache clear" first.
| * | Stop exceptions being thrown if GenerateMapTiles = false but no static map ↵Justin Clark-Casey (justincc)2013-02-022-7/+18
| | | | | | | | | | | | tile has been set. Do more informative warn instead.
* | | Merge branch 'avination' into careminsterMelanie2013-01-311-13/+10
|\ \ \
| * | | Change default avatar replacements to be ruth rather than urban maleMelanie2013-01-281-13/+10
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-01-312-18/+67
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-01-311-18/+63
| |\ \ \
| | * | | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵Jak Daniels2013-01-301-18/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | | Added option for UUID as command parameters. This lets the command handle ↵Dan Lake2013-01-311-0/+4
| |/ / / | | | | | | | | | | | | the UUID parsing and type checking before the command is executed.
* | | | Merge branch 'master' into careminsterMelanie2013-01-311-8/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | | minor: Tidy up disabled logging on AssetTransactionModule for future use. ↵Justin Clark-Casey (justincc)2013-01-291-8/+10
| | | | | | | | | | | | | | | | Make it clear that transaction parameter to HandleUDPUploadRequest is an ID.
* | | | Merge branch 'avination' into careminsterMelanie2013-01-271-4/+259
|\ \ \ \ | | |/ / | |/| |
| * | | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-1/+2
| | | | | | | | | | | | | | | | | | | | sends an asset transaciton but it is empty. So we can't ignore name data when a transaction is present and can't treat every transaction as valid.
| * | | * This update is ugly as sin, but it 'fills in the blanks' of your ↵teravus2013-01-261-4/+259
| | | | | | | | | | | | | | | | appearance when your inventory items go missing. This repairs appearance from missing wearables immediately on the V1 appearance pipeline, the second login on Firestorm. It only replaces the essential body parts that are missing.. hair, skin, eyes, shape... so if you delete all your wearables, you will rez naked. Anyway, this is still experimental.. I need another day of playing with this to handle all of the situations. One thing that I still need to do is try and get the assets.. and if we can't get the assets for some reason, skip and replace that part of the outfit.
* | | | Merge branch 'master' into careminsterMelanie2013-01-271-1/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sends an asset transaciton but it is empty. So we can't ignore name data when a transaction is present and can't treat every transaction as valid. Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
* | | | Merge branch 'master' into careminsterMelanie2013-01-261-1/+1
|\ \ \ \ | |/ / /
| * | | Fix issue where the "set terrain texture" console command did not tell the ↵Justin Clark-Casey (justincc)2013-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | viewers that textures had updated (hence they did not display the changes). Addresses http://opensimulator.org/mantis/view.php?id=6513
* | | | Merge branch 'master' into careminsterMelanie2013-01-262-6/+6
|\ \ \ \ | |/ / /
| * | | minor: Fix full scene part console report to show proper Light* names rather ↵Justin Clark-Casey (justincc)2013-01-261-5/+5
| | |/ | |/| | | | | | | than all wrongly FlexiDrag
| * | Add basic JsonCreateStore() regression testJustin Clark-Casey (justincc)2013-01-251-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-251-0/+15
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | Mantis 6508 llHTTPResponse body is incorrectly interpreted by IETalun2013-01-241-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch html escapes responses going to IE so that they cannot be interpreted as HTML if the response type is "text/plain". This has no effect if the reponse type has been set to "text/html" by osSetContentType Signed-off-by: nebadon <michael@osgrid.org>
* | | Merge branch 'avination' into careminsterMelanie2013-01-241-0/+6
|\ \ \ | | |/ | |/|
| * | Null check the response body to make sure we're not crashing the script engineMelanie2013-01-241-0/+6
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-232-22/+60
|\ \ \ | |/ /
| * | EXPERIMENTAL - Comment out the check for the agent already being in transitMelanie2013-01-231-8/+9
| | | | | | | | | | | | | | | to prevent avatars being locked into their sim on a failed teleport. May have side effects and must be revisited to fix right.
| * | Allow TeleportCancel packets to reset the transfer state machineMelanie2013-01-211-0/+6
| | |
| * | Implement HTTP Request froma thread pool to avoid packet congestionMelanie2013-01-201-14/+45
| | |
| * | Revert "Refactor scripted http request to use async calls rather than hard ↵Melanie2013-01-201-87/+53
| | | | | | | | | | | | | | | | | | threads" This reverts commit 461ecd7cf9edebce45ab715901a7f3b02c216e7b.
| * | Refactor scripted http request to use async calls rather than hard threadsMelanie2013-01-201-53/+87
| | |
* | | Merge branch 'avination'Melanie2013-01-192-262/+71
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
| * | Remove the core groups moduleMelanie2013-01-191-252/+0
| | |
| * | Kill the dumb Opensimulator Testing group again - for good.Melanie2013-01-191-8/+3
| | |
| * | * Enables loading cached bakes on teleport by filling in the appropriate ↵teravus2013-01-161-2/+71
| | | | | | | | | | | | | | | | | | avatar fields from the bake data. No more auto rebaking on teleport assuming your wearables, bakes and cache are consistent. * Speeds up appearance sending.. since there's nothing to wait for.
* | | Merge branch 'master' into careminsterMelanie2013-01-161-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 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
| * | Changed a couple of debug messages at the request of osgrid.Diva Canto2013-01-161-2/+2
| | |
| * | Implement a workaround solution for saving manual script state changes by ↵Justin Clark-Casey (justincc)2013-01-111-5/+19
| | | | | | | | | | | | | | | | | | | | | the user before logout instead of wrongly removing the script early. This workaround relies on the fact that a closing client goes inactive before the attachments derez calls happen. This reverts the change to remove scripts too early instead of stopping them, since the the two step stop then remove is necessary to execute the detach event.
| * | Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-111-1/+17
| | | | | | | | | | | | | | | | | | | | | This involves making Attachments module listen for start/stop script changes. It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim. Not just in a state where their scripts have been stopped.
* | | Merge branch 'master' into careminsterMelanie2013-01-111-7/+12
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-101-7/+12
| | | | | | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
* | | Merge branch 'master' into careminsterMelanie2013-01-101-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
generated by cgit v1.1 at 2024-12-23 02:42:56 +0000