opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into careminster	Melanie	2012-11-04	1	-0/+9
\|\
\| *	HG Suitcase Inventory: if RootFolder type doesn't work, look for any folder ↵	Diva Canto	2012-11-03	1	-0/+9
\| \| \| \| \| \| \| \|	with parentID=UUID.Zero
* \|	Merge branch 'avination' into careminster	Melanie	2012-11-04	1	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
\| * \|	Squash reporting HelloNeighbor exception - it simply means the other sim	Melanie	2012-11-02	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	is down, no need for yellow ink.
* \| \|	Merge branch 'master' into careminster	Melanie	2012-11-03	3	-36/+9
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ↵	Diva Canto	2012-11-02	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	THESE.
\| * \|	Move check to allow only deletion of maptiles up to AssetServerDeleteHandler ↵	Justin Clark-Casey (justincc)	2012-11-02	2	-31/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \|	Merge branch 'master' into careminster	Melanie	2012-10-31	1	-1/+5
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
\| * \|	Add method doc to IAssetService.Get(string, object, AssetRetrieved) ↵	Justin Clark-Casey (justincc)	2012-10-30	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \|	Merge branch 'master' into careminster	Melanie	2012-10-20	4	-5/+41
\|\ \ \ \| \|/ /
\| * \|	Add method doc for IPresenceService	Justin Clark-Casey (justincc)	2012-10-20	1	-1/+37
\| \| \|
\| * \|	Improve efficiency of friends notification by only make one PresenceService ↵	Justin Clark-Casey (justincc)	2012-10-20	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \|	Merge branch 'master' into careminster	Melanie	2012-10-16	1	-1/+1
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
\| * \|	minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now.	Justin Clark-Casey (justincc)	2012-10-16	1	-1/+1
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2012-10-12	4	-29/+42
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
\| * \|	minor: Add documentation to IGridService.GetRegionFlags()	Justin Clark-Casey (justincc)	2012-10-09	1	-0/+13
\| \| \|
\| * \|	Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it ↵	Justin Clark-Casey (justincc)	2012-10-09	3	-29/+29
\| \| \| \| \| \| \| \| \| \| \| \|	easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
* \| \|	Merge branch 'avination' into careminster	Melanie	2012-10-07	1	-16/+21
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
\| * \|	Fix threading in remote asset connector	Melanie	2012-10-05	1	-16/+21
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2012-10-07	2	-4/+15
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Diva Canto	2012-10-04	2	-4/+9
\| \|\ \
\| \| * \|	Make the asset retrieval concurrency a config switch. The current value	Mic Bowman	2012-10-04	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of 30 is still hanging badly on some mono versions. The switch defaults to 30 to preserve current behavior.
\| * \| \|	One more abstraction for GridUser so that it can be overridden in a sub-class.	Diva Canto	2012-10-04	1	-2/+7
\| \| \| \|
* \| \| \|	Merge branch 'master' into careminster	Melanie	2012-10-03	1	-1/+1
\|\ \ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
\| * \| \|	string format arguments in wrong order	SignpostMarv	2012-10-02	1	-1/+1
\| \|/ /
* \| \|	Merge branch 'master' into careminster	Melanie	2012-10-02	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	On more virtual method	Diva Canto	2012-10-01	1	-1/+1
\| \| \|
\| * \|	Allow setting max connections for an endpoint	Melanie	2012-09-30	1	-3/+3
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2012-09-30	1	-12/+1
\|\ \ \ \| \|/ /
\| * \|	Revert "Added request.Proxy=null everywhere, as discussed in ↵	Diva Canto	2012-09-30	5	-9/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
\| * \|	Added request.Proxy=null everywhere, as discussed in ↵	Diva Canto	2012-09-30	5	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Made a method of GridUserService virtual so it can be overridden.	Diva Canto	2012-09-30	1	-12/+1
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2012-09-29	2	-11/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
\| * \|	Removed the bits about the TOSModule. That module doesn't go into core. ↵	Diva Canto	2012-09-27	2	-11/+0
\| \| \| \| \| \| \| \| \| \| \| \|	WARNING: migration on GridUser withdrawn too, but left the migration number there.
* \| \|	Merge branch 'avination' into careminster	Melanie	2012-09-27	1	-37/+67
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
\| * \|	Sequence/throttle asset retrievals.	Melanie	2012-09-14	1	-37/+67
\| \| \|
* \| \|	Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster	Melanie	2012-09-27	3	-4/+37
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Use GridUser properly for foreign users.	Diva Canto	2012-09-26	1	-4/+27
\| \| \|
\| * \|	TOS module. WARNING: migration in GridUser table.	Diva Canto	2012-09-25	2	-0/+10
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2012-09-24	3	-14/+177
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
\| * \|	HG 2.0: User Agent Service now can also control where the local users can ↵	Diva Canto	2012-09-22	1	-3/+100
\| \| \| \| \| \| \| \| \| \| \| \|	go. Domain-name and user-level based. \o/
\| * \|	More HG 2.0: access control at the Gatekeeper. \o/	Diva Canto	2012-09-21	1	-8/+54
\| \| \|
\| * \|	Minor: change the return value of unsuccessful posts to string.Empty.	Diva Canto	2012-09-21	1	-1/+1
\| \| \|
\| * \|	Improvement over last commit: refactor the asset permissions code, so that ↵	Diva Canto	2012-09-20	1	-58/+5
\| \| \| \| \| \| \| \| \| \| \| \|	it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
\| * \|	More HG2.0: Added permission policies in HGAsset Service based on asset ↵	Diva Canto	2012-09-20	1	-3/+76
\| \| \| \| \| \| \| \| \| \| \| \|	types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
* \| \|	Merge branch 'avination' into careminster	Melanie	2012-09-16	1	-2/+2
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
\| * \|	Allow setting max connections for an endpoint	Melanie	2012-09-14	1	-2/+2
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2012-09-16	2	-6/+59
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
\| * \|	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Diva Canto	2012-09-15	1	-2/+2
\| \|\ \
\| \| * \|	Add basic asset connector tests to check behaviour for normal, local and ↵	Justin Clark-Casey (justincc)	2012-09-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	temporary assets. Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.