opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into careminster	Melanie	2013-06-08	1	-0/+29
\|\
\| *	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim	Melanie	2013-06-07	1	-0/+29
\| \|\
\| \| *	Put the configuration back in FetchInventoryDesc2 cap.	Diva Canto	2013-06-07	1	-0/+29
\| \| \|
\| * \|	Supply proper type information for the various types of requests	Melanie	2013-06-07	1	-0/+1
\| \| \|
\| * \|	Adding Avination's PollService to round out the HTTP inventory changes	Melanie	2013-06-07	2	-4/+4
\| \|/
\| *	Port Avination's inventory send throttling	Melanie	2013-06-05	1	-52/+213
\| \|
* \|	Merge branch 'avination-current' into careminster	Melanie	2013-06-06	2	-2/+34
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
\| * \|	Let the event queue do lees work - expire every 40s as per Teravus instead ↵	Melanie	2013-05-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	of every seconds - whoever put that in....
\| * \|	Fix CAPS to work like they should - do not send caps to the viewer if ↵	Melanie	2013-04-30	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case.
\| * \|	Send 503 when throttling textures	Melanie	2013-04-25	1	-1/+33
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2013-05-12	1	-1/+0
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
\| * \|	Delete debug message	Diva Canto	2013-05-10	1	-1/+0
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2013-05-08	1	-0/+140
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
\| * \|	Added AvatarPickerSearch capability handler.	Diva Canto	2013-05-07	1	-0/+140
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2013-05-01	1	-1/+12
\|\ \ \ \| \|/ / \| \| / \| \|/ \|/\|	Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
\| *	Fix CAPS to work like they should - do not send caps to the viewer if ↵	Melanie	2013-04-30	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case.
* \|	Merge branch 'master' into careminster	Melanie	2013-03-28	1	-1/+24
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
\| *	minor: Fix usage error message for "debug eq" console command	Justin Clark-Casey (justincc)	2013-03-28	1	-1/+1
\| \|
\| *	Add "show eq" console command to show numbers of messages in agent event queues.	Justin Clark-Casey (justincc)	2013-03-28	1	-0/+23
\| \| \| \| \| \| \| \|	For debugging purposes.
* \|	Merge branch 'master' into careminster	Melanie	2013-03-26	1	-0/+6
\|\ \ \| \|/
\| *	Implement a pref to turn on the simulator ExportSupported feature entry.	Melanie	2013-03-26	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	This tells the viewer to enable the UI for export permissions. WARNING: If your inventory store contains invalid flags data, this will result in items becoming exportable! Don't turn this on in production until it's complete!
\| *	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	Melanie	2013-03-26	2	-2/+4
\| \| \| \| \| \| \| \|	with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* \|	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	Melanie	2013-03-24	1	-4/+5
\| \| \| \| \| \| \| \|	with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* \|	Merge branch 'master' into careminster	Melanie	2013-03-13	1	-1/+3
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
\| *	minor: Remove mono compiler warnings in EventQueueTests	Justin Clark-Casey (justincc)	2013-03-11	1	-1/+3
\| \|
* \|	Merge branch 'master' into careminster	Melanie	2013-03-05	1	-5/+5
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
\| *	Fix issue in the mesh upload flag module where the ID of the last agent to ↵	Justin Clark-Casey (justincc)	2013-03-04	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|	request the capability was always used instead of the original requesting agent for each cap. Should address http://opensimulator.org/mantis/view.php?id=6556
* \|	Merge branch 'avination' into careminster	Melanie	2013-03-03	3	-2/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
\| * \|	Make a viewer sent XML error prettier	Melanie	2013-03-03	1	-0/+4
\| \| \|
\| * \|	The viewer tries to parse the error message body to LLSD - give it some.	Melanie	2013-02-24	1	-2/+2
\| \| \|
\| * \|	Fix an issue where the viewer would request the seed cap before	Melanie	2013-02-18	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	there was a handler for it.
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-22	3	-6/+6
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Deleted all AssemblyFileVersion directives	Diva Canto	2013-02-19	1	-1/+1
\| \| \|
\| * \|	minor: remove some mono compiler warnings in ↵	Justin Clark-Casey (justincc)	2013-02-20	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	OpenSim.Region.ClientStack.Linden.Caps.dll
\| * \|	Add an event and some logic to allow customizing Simulator Features by avatar	Melanie	2013-02-14	1	-4/+21
\| \| \|
\| * \|	Make the sim features module register it's interface so it can be used	Melanie	2013-02-13	1	-0/+2
\| \| \|
\| * \|	Plumb the path from the client to the extra physics params and back	Melanie	2013-02-07	2	-0/+28
\| \| \|
\| * \|	Send the new physics params to the viewer build dialog	Melanie	2013-02-07	1	-0/+35
\| \| \|
\| * \|	* the root prim was being given an OffsetPosition in addition to setting the ↵	teravus	2013-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	position when creating the root prim. The offset position caused the positioning code to re-move the root prim when you selected it and released it.
* \| \|	Merge branch 'avination' into careminster	Melanie	2013-02-14	1	-4/+21
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Add an event and some logic to allow customizing Simulator Features by avatar	Melanie	2013-02-14	1	-4/+21
\| \| \|
* \| \|	Merge branch 'avination' into careminster	Melanie	2013-02-14	1	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Small fix to sim features module	Melanie	2013-02-14	1	-0/+2
\| \| \|
* \| \|	Merge branch 'avination' into careminster	Melanie	2013-02-07	1	-7/+70
\|\ \ \ \| \|/ /
\| * \|	Rename Bounciness to Restitution	Melanie	2013-02-07	1	-1/+1
\| \| \|
\| * \|	Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP	Melanie	2013-02-06	1	-7/+70
\| \| \|
* \| \|	Rename Bounciness to Restitution	Melanie	2013-02-07	1	-1/+1
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-05	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'master' of melanie@opensimulator.org:/var/git/opensim	Melanie	2013-02-05	1	-1/+1
\| \|\ \
\| \| * \|	Bump version and assembly version numbers from 0.7.5 to 0.7.6	Justin Clark-Casey (justincc)	2013-02-05	1	-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.