aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* add a Check method to flotsamAssetCache, so to check if a asset is inUbitUmarov2012-12-135-13/+128
| | | | | | | | 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-11-232-9/+22
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Remove the redundant BypassPermissions() checks in EstateManagmentModule.Justin Clark-Casey (justincc)2012-11-231-8/+13
| | | | | | | | This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
| * minor: Add some console feedback on region restart and log who requested a ↵Justin Clark-Casey (justincc)2012-11-232-1/+9
| | | | | | | | region restart if done from the viewer.
* | Merge branch 'master' into careminsterMelanie2012-11-204-193/+149
|\ \ | |/
| * If GetAgents() is called with an empty userIDs array then don't bother with ↵Justin Clark-Casey (justincc)2012-11-201-0/+4
| | | | | | | | | | | | | | a useless potentially network call on the scene presence service connector. This also eliminates the "[PRESENCE HANDLER]: GetAgents called without required uuids argument" which has started to pop up in the logs when a call is made with an empty uuid array as occasionally happens.
| * refactor: Move common presence connector code into BasePresenceServiceConnectorJustin Clark-Casey (justincc)2012-11-204-193/+145
| |
* | Merge branch 'avination' into careminsterMelanie2012-11-171-11/+20
|\ \
| * | Prevent a buffer overflow in asset receivingMelanie2012-11-171-11/+20
| | |
| * | 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-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-151-12/+8
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | Following on from 4f982596, launch map name requests on an async thread from ↵Justin Clark-Casey (justincc)2012-11-151-12/+8
| | | | | | | | | | | | | | | | | | LLClientView directly. This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling
* | | Merge branch 'master' into careminsterMelanie2012-11-152-5/+3
|\ \ \ | |/ /
| * | Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset ↵Diva Canto2012-11-141-4/+2
| | | | | | | | | | | | service)
| * | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵Diva Canto2012-11-131-1/+1
| | | | | | | | | | | | have an AssemblyInfo file.
* | | Merge branch 'master' into careminsterMelanie2012-11-1359-84/+158
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | Deleted .addin.xml. Added AssemblyInfo.csDiva Canto2012-11-132-15/+38
| | |
| * | Last 27 modules' directives (service connectors out).Diva Canto2012-11-1327-33/+54
| | |
| * | Another 11 modules' directions moved out of .addin.xmlDiva Canto2012-11-1312-14/+22
| | |
| * | Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-1321-22/+41
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-1315-82/+95
|\ \ \ | |/ /
| * | Moved the WindModule and its own plugins out of .addin.xmlDiva Canto2012-11-124-5/+5
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-121-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
| * | | Another 10 modules' directives moved from .addin.xmlDiva Canto2012-11-1211-10/+20
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-11-137-6/+12
|\ \ \ | |/ /
| * | More module cleanup: removed the CoreModules.Framework modules directives ↵Diva Canto2012-11-127-6/+12
| | | | | | | | | | | | out of .addin.xml.
* | | Merge branch 'master' into careminsterMelanie2012-11-1318-18/+18
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-121-1/+1
| |\ \
| * | | Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-1218-18/+18
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Update ScriptModuleComms name space to CoreModulesMelanie2012-11-131-1/+1
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-11-1220-23/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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-1220-24/+24
| | | | | | | | | | | | grepping for remaining uses
* | | Merge branch 'master' into careminsterMelanie2012-11-128-254/+416
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | Fix mantis #6425Diva Canto2012-11-111-6/+0
| | |
| * | Fix issues with the DynamicTextureModule and corresponding unit tests.Diva Canto2012-11-113-32/+39
| | |
| * | One more module converted: PermissionsModule.Diva Canto2012-11-111-112/+155
| | |
| * | One more module converted: XMLRPCModule. Removed it from the special loading ↵Diva Canto2012-11-111-31/+51
| | | | | | | | | | | | at start.
| * | One more module converted: VectorRenderModule.Diva Canto2012-11-111-27/+41
| | |
| * | One more module: DynamicTextureModule. Removed it from the special load in ↵Diva Canto2012-11-111-11/+27
| | | | | | | | | | | | the beginning.
| * | One more module converted: LoadImageURLModule. Also removed it from its ↵Diva Canto2012-11-111-19/+38
| | | | | | | | | | | | hard-coded instantiation (I think I understood what the problem was, and that I've done it right).
| * | One more module converted: ScriptsHttpRequests.Diva Canto2012-11-111-9/+25
| | |
| * | One more module converted: EmailModule.Diva Canto2012-11-111-46/+64
| | |
| * | J2KDecoderModule: move the code out of PostInitialise()Diva Canto2012-11-111-8/+17
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-112-64/+78
|\ \ \ | |/ /