OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,071 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

1310 Commits (9d2e832b85e35edea8bd177df9de4eb3ee18b004)

Author SHA1 Message Date
Melanie d1dd5a8ba9 Add the interfaces for the new Avination baked texture cache service 2012-12-19 13:04:41 +01:00
UbitUmarov c73c2fb070 add some default size setting and checks 2012-12-07 21:53:33 +00:00
UbitUmarov 93bede4e6a revert the use of avatar skeleton and use avatar size provided by viewers, 
since at least for now seems good enought
 2012-12-07 21:26:58 +00:00
Melanie e4659a83f1 Merge branch 'master' into careminster 2012-11-17 02:03:24 +00:00
Justin Clark-Casey (justincc) 5b79bfc4df Remove old InventoryService, which has for a long time been replaced by XInventoryService. 2012-11-17 01:32:01 +00:00
Justin Clark-Casey (justincc) 392e84e554 Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid 
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
 2012-11-17 01:23:29 +00:00
Justin Clark-Casey (justincc) 2aa58c5843 Do not allow invariants to change on calls to XInventoryService.UpdateItem() 
This is to help track down http://opensimulator.org/mantis/view.php?id=6359 where creator IDs on items and rezzed objects have been reported to sometimes change.
This should never happen - a particular item should never change creators (if an item is given then a new item (with new id) is created).
Invariants are inventory type, asset type, folder (changed only on MoveItems()), CreatorIdentification and Owner.
If caller attempts to change an invariant, warning is logged but other properties are still changed.
If you see this warning, reporting on Mantis 6359 would be very welcome with the exact operation being done at the time.
 2012-11-17 01:01:14 +00:00
Justin Clark-Casey (justincc) e25c51330a Add basic XInventoryServicesTests.TestAddItem() regression test. 2012-11-17 00:12:25 +00:00
Diva Canto df62d113ab The last few AssemblyInfos. Finished! 2012-11-14 21:18:18 -08:00
Melanie 9a5679876e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
 2012-11-13 02:10:09 +00:00
Diva Canto 86903f23dd Cleanup on region modules: gave short node id's to all of them. 2012-11-12 18:08:02 -08:00
Melanie 415b89f434 Merge branch 'master' into careminster 2012-11-09 22:58:42 +00:00
Justin Clark-Casey (justincc) 75c880a6f3 Update parent inventory folder version numbers when folders are moved/created/deleted to match version numbers cached by viewers. 
This is done in the way that one would expect (e.g. moving a folder increments version number on both source and destination parent folders).
This should hopefully improve viewer reuse of its cached inventory information.
Currently MySQL only but will be implement for SQLite/MSSQL if there are no issues.
 2012-11-09 01:13:19 +00:00
Diva Canto eb273b808e HG: Hopefully this fixes the issues with port 80 once and for all. 2012-11-07 19:59:54 -08:00
Melanie c623e35805 Merge branch 'master' into careminster 2012-11-04 22:44:42 +00:00
Melanie dd416298f1 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-11-04 22:37:28 +00:00
Diva Canto 783443705d HG Suitcase Inventory: if RootFolder type doesn't work, look for any folder with parentID=UUID.Zero 2012-11-03 12:03:47 -07:00
Melanie d0473b73da Merge branch 'master' into careminster 2012-11-03 15:38:47 +00:00
Melanie fd2bee8da1 Squash reporting HelloNeighbor exception - it simply means the other sim 
is down, no need for yellow ink.
 2012-11-02 16:43:38 +01:00
Diva Canto 7412795a0b HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST THESE. 2012-11-02 08:05:56 -07:00
Justin Clark-Casey (justincc) 462ad336dc Move check to allow only deletion of maptiles up to AssetServerDeleteHandler from AssetService. 
This allows us to use a common check for both AssetService and XAssetService.
It also allows future console commands to delete an asset.
As before, deletion of maptile assets is not allowed remotely unless this is explicitly configured.
 2012-11-02 00:02:10 +00:00
Melanie 28a4ea73ea Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/ChildAgentDataUpdate.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-10-31 00:13:33 +00:00
Justin Clark-Casey (justincc) 9bc4dc6c5f Add method doc to IAssetService.Get(string, object, AssetRetrieved) outlining the situations in which AssetRetrieved may be called back with a null AssetBase. 
These situations include asset not found and remote service not responding.
 2012-10-30 01:19:32 +00:00
Melanie 6ad8d3c43f Merge branch 'master' into careminster 2012-10-20 02:33:24 +01:00
Justin Clark-Casey (justincc) ac037dfe21 Add method doc for IPresenceService 2012-10-20 02:26:08 +01:00
Justin Clark-Casey (justincc) da2b23f18d Improve efficiency of friends notification by only make one PresenceService call for all friends rather than one for each friend. 
However, large groups could still take a very long time since we still need to message each avatar on different simulators.
 2012-10-20 02:02:13 +01:00
Melanie fa52effb27 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
 2012-10-16 04:30:01 +01:00
Justin Clark-Casey (justincc) 8459b98f68 minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now. 2012-10-16 01:40:25 +01:00
Melanie 6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-10-12 19:05:06 +01:00
Justin Clark-Casey (justincc) ef3cc2e507 minor: Add documentation to IGridService.GetRegionFlags() 2012-10-09 01:40:55 +01:00
Justin Clark-Casey (justincc) 73c9abf5f2 Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this. 2012-10-09 01:35:27 +01:00
Melanie 0c5b36a4f7 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
 2012-10-07 03:12:21 +01:00
Melanie f7df68d922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
 2012-10-07 02:48:28 +01:00
Diva Canto 276fdbc1b3 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-04 15:33:17 -07:00
Diva Canto 5b90f5bb17 One more abstraction for GridUser so that it can be overridden in a sub-class. 2012-10-04 15:32:49 -07:00
Melanie d5ea203f93 Fix threading in remote asset connector 2012-10-05 00:15:55 +02:00
Mic Bowman d98af79f77 Make the asset retrieval concurrency a config switch. The current value 
of 30 is still hanging badly on some mono versions. The switch defaults to
30 to preserve current behavior.
 2012-10-04 08:41:06 -07:00
Melanie 23d5bafa7f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-10-03 00:24:33 +01:00
SignpostMarv e81e19a3b4 string format arguments in wrong order 2012-10-02 22:11:40 +01:00
Melanie e40cc46712 Merge branch 'master' into careminster 2012-10-02 00:06:02 +01:00
Diva Canto 0b9bf236dd On more virtual method 2012-10-01 15:55:24 -07:00
Melanie 060d6fe8f4 Allow setting max connections for an endpoint 2012-09-30 16:30:16 +01:00
Diva Canto 91a5c602e3 Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." 
But the patch is here, in case anyone wants to try it.

This reverts commit 531edd51d8.
 2012-09-30 07:48:03 -07:00
Melanie b9a883f1ca Merge branch 'master' into careminster 2012-09-30 15:46:43 +01:00
Diva Canto 531edd51d8 Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. 
Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
 2012-09-30 07:22:55 -07:00
Diva Canto 5b69872655 Made a method of GridUserService virtual so it can be overridden. 2012-09-30 06:51:49 -07:00
Melanie 71dd55a1ce Merge branch 'master' into careminster 
Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-09-29 19:21:07 +01:00
Diva Canto 7a50705188 Removed the bits about the TOSModule. That module doesn't go into core. WARNING: migration on GridUser withdrawn too, but left the migration number there. 2012-09-27 16:43:18 -07:00
Melanie 001ec0e2e6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-27 17:29:44 +01:00
Melanie 637f5440fe Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster 2012-09-27 15:46:35 +01:00