aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-01-101-6/+1
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * * This finishes the implementation of AgentCachedTexture. Requires the ↵teravus2012-12-291-6/+1
| | | | | | | | 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-062-11/+27
|\ \ | |/
| * * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-212-11/+27
| | | | | | | | Cached Bakes.
* | Merge branch 'master' into careminsterMelanie2013-01-042-12/+13
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: Add some doc to the extremely unhelpful 'fudge....' comment as to why ↵Justin Clark-Casey (justincc)2013-01-031-1/+4
| | | | | | | | | | | | we're deselecting the prim in code before scheduling an update on attachment
| * | Fix problem where object attached from ground often does not get attached ↵Justin Clark-Casey (justincc)2013-01-031-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | properly. It seems this is happening because we send a kill for objects that are selected when attached. A code comment says that this is to get the client to deselect it, but v3 and v1 clients do this just fine without the kill. Aims to address http://opensimulator.org/mantis/view.php?id=6456
| * | If Save OAR/IAR times-out while waiting for assets then notify the caller ↵Oren Hurvitz2013-01-021-2/+8
| | | | | | | | | | | | that the operation failed
* | | Merge branch 'avination' into careminsterMelanie2012-12-181-16/+65
|\ \ \ | | |/ | |/|
| * | add a Check method to flotsamAssetCache, so to check if a asset is inUbitUmarov2012-12-131-13/+38
| | | | | | | | | | | | | | | | | | | | | | | | 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*
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-8/+23
| | | | | | | | | | | | since at least for now seems good enought
| * | *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-071-1/+10
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-091-70/+68
|\ \ \ | | |/ | |/|
| * | Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message ↵Justin Clark-Casey (justincc)2012-12-081-70/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to nominate a non-root destination folder. This is in relation to http://opensimulator.org/mantis/view.php?id=6311 This is after further analysis which shows the viewer expects the server to move the folder for #RLV give but then should be renaming the folder itself. For some reason this is not happening, possibly because we are not sending BulkUpdates or because we are not using transaction IDs properly. This needs to be fixed in the future. However, moving the folder even if the rename isn't correctly triggered in the viewer seems preferable to disabling this code altogether.
* | | Merge branch 'master' into careminsterMelanie2012-12-071-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | minor: also comment out the debug log message which reports searching for ↵Justin Clark-Casey (justincc)2012-12-041-2/+2
| | | | | | | | | | | | child agents in simulator scenes for now.
| * | minor: Comment out "Delivering IM to..." messages for now.Justin Clark-Casey (justincc)2012-12-041-3/+3
| | |
| * | Bug fix in OfflineMessageModule. Mantis #6446Diva Canto2012-12-041-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-302-14/+21
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * | Bug fix in Offline IM for inventory transfers. The items were being placed ↵Diva Canto2012-11-271-11/+15
| | | | | | | | | | | | twice in the receiver's inventory.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-272-2/+2
| |\ \
| * | | Prevent the core Groups module from being enabled when its name doesn't ↵Diva Canto2012-11-271-0/+3
| | | | | | | | | | | | | | | | match the "default" ini choice
* | | | Merge branch 'master' into careminsterMelanie2012-11-252-2/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * | Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-242-2/+2
| |/ | | | | | | automatically turns off any logging enabled between tests
* | Merge branch 'master' into careminsterMelanie2012-11-172-5/+4
|\ \ | |/
| * Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-172-5/+4
| | | | | | | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
* | Merge branch 'master' into careminsterMelanie2012-11-1310-0/+19
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-1310-0/+19
| |
* | Merge branch 'master' into careminsterMelanie2012-11-131-67/+70
|\ \ | |/
| * Disable code to get server-side to move given items to a destination folder ↵Justin Clark-Casey (justincc)2012-11-131-67/+70
| | | | | | | | | | | | | | | | | | on TaskInventoryAccepted. This is because the fixes to inventory versioning (so that they better match viewer expections) now appear to allow the viewer to execute #RLV moves, as happens on the LL grid. Doing it again server-side now wrongly creates another child #RLV folder underneath the root one. As per http://opensimulator.org/mantis/view.php?id=6311
* | Merge branch 'master' into careminsterMelanie2012-11-1310-10/+10
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-1210-10/+10
| |
* | Merge branch 'master' into careminsterMelanie2012-11-123-3/+3
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-123-3/+3
| | | | | | | | grepping for remaining uses
* | Merge branch 'master' into careminsterMelanie2012-11-117-90/+292
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * One more module converted: InventoryArchiverModule.Diva Canto2012-11-111-8/+31
| |
| * One more module converted: GroupsModule.Diva Canto2012-11-101-7/+43
| |
| * One more module converted: GodsModule.Diva Canto2012-11-101-19/+49
| |
| * One more module converted: GesturesModule.Diva Canto2012-11-101-6/+27
| |
| * One more module converted: Combat/CombatModule.Diva Canto2012-11-101-4/+25
| |
| * One more module converted: AvatarFactoryModule.Diva Canto2012-11-101-6/+31
| |
| * formatting DialogModule for 80-character width terminalSignpostMarv2012-11-101-47/+73
| |
| * Converting DialogModule to INonSharedRegionModuleSignpostMarv2012-11-101-5/+23
| |
| * To keep things consistent allowing an UnregisterModuleInterface... Force ↵teravus2012-11-061-5/+13
| | | | | | | | the GodModule to request the dialog module interface on a kickuser call and not to use the 'in memory cached one'. Thanks Ar3s for locating the offending inconsistency.
* | Merge branch 'master' into careminsterMelanie2012-11-041-9/+12
|\ \ | |/
| * Prevent IMs being sent to prims when avies decline inventory offers from them.Diva Canto2012-11-041-9/+12
| |
* | Merge branch 'master' into careminsterMelanie2012-11-011-2/+2
|\ \ | |/
| * Comment out checks not to overwrite existing IAR/OAR files for now on "save ↵Justin Clark-Casey (justincc)2012-11-011-2/+2
| | | | | | | | | | | | | | iar/oar" since this causes problems for some backup systems. Needs more thought, maybe an explicit --force/--overwrite switch Comments on http://opensimulator.org/mantis/view.php?id=6389
* | Merge branch 'master' into careminsterMelanie2012-10-311-3/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-311-3/+3
| | | | | | | | | | Uses new IEntityInventory.TryGetScriptInstanceRunning() Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
generated by cgit v1.1 at 2025-03-10 21:32:03 +0000