aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Add support for user preferences (im via email)"Melanie2013-12-072-69/+0
| | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
* Merge branch 'master' into careminsterMelanie2013-12-072-0/+69
|\
| * Add support for user preferences (im via email)BlueWall2013-12-062-0/+69
| |
* | Merge branch 'master' into careminsterMelanie2013-11-2311-64/+146
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * Fix false positive test failure in ↵Justin Clark-Casey (justincc)2013-11-231-2/+2
| | | | | | | | | | | | TestRepeatSameDrawContainingImageReusingTexture() and TestRepeatSameDrawContainingImage() if localhost has a webserver set up. Use 0.0.0.0 instead of localhost
| * minor: Use default(UUID) in rez attachment failure error logging rather than ↵Justin Clark-Casey (justincc)2013-11-151-1/+1
| | | | | | | | | | | | | | (UUID)null Patch from http://opensimulator.org/mantis/view.php?id=6843 Thanks Kira.
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-158-14/+14
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
| * If a local land ID is given to the "land show" command, then output to ↵Justin Clark-Casey (justincc)2013-11-151-54/+126
| | | | | | | | | | | | console the full details of that parcel. Using "land show" without a land ID still outputs a summary of parcels in the region
* | Merge branch 'master' into careminsterMelanie2013-11-082-44/+76
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * Make "fcache status" command also display information on disk/mem cache hit ↵Justin Clark-Casey (justincc)2013-10-301-18/+38
| | | | | | | | rate that is currently only displayed if LogLevel >=1 in [AssetCache] config
| * Put fcache commands output to console, not logJustin Clark-Casey (justincc)2013-10-301-28/+25
| |
| * Show texture ids for full object/part info console commmdsJustin Clark-Casey (justincc)2013-10-241-1/+16
| |
* | Merge branch 'master' into careminsterMelanie2013-11-036-89/+80
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-151-43/+8
| | | | | | | | Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
| * Made terrain uploads thread-safeOren Hurvitz2013-10-153-22/+40
| |
| * * Refactorteravus2013-10-072-4/+4
| | | | | | | | * Break out common BasicDOSProtector code into separate class.
| * * Added a Basic DOS protection container/base object for the most common ↵teravus2013-10-072-3/+30
| | | | | | | | | | | | | | | | | | HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler * Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice. * Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers * Added CircularBuffer, used for CPU and Memory friendly rate monitoring. * DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-10-062-3/+8
|\ \ | | | | | | | | | careminster
| * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵teravus2013-10-052-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | shouldn't * Fixes cases where Last Attachment Point doesn't get written when it should. * Fixes Null Reference in BaseHttpServer when shutting down, null path provided. * Drop then Wear retains Last Attachment Point
* | | Merge branch 'master' into careminsterMelanie2013-10-062-1/+37
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Added SimulatorFeatures/OpenSimExtras: say-range, whisper-range, ↵Diva Canto2013-10-041-0/+37
| | | | | | | | shout-range, at the request of Singularity dev Liru-Dargon
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-10-0412-36/+129
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-275-10/+10
| | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
| * minor: correct attachment spelling mistake in log message in ↵Justin Clark-Casey (justincc)2013-09-261-1/+1
| | | | | | | | HGEntityTransferModule.OnIncomingSceneObject()
| * minor: Comment out windlight log message about sending scene data for now.Justin Clark-Casey (justincc)2013-09-261-1/+2
| |
| * minor: log MaxOutgoingTransferVersion at EntityTransferModule startupJustin Clark-Casey (justincc)2013-09-261-0/+4
| |
| * minor: correct spelling of Initialized in LSC connector version messageJustin Clark-Casey (justincc)2013-09-251-1/+1
| |
| * Move adding UUID.Zero -> Unknown User binding to UMM.Init() so that it's ↵Justin Clark-Casey (justincc)2013-09-251-2/+1
| | | | | | | | also called by HGUserManagementModule
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-222-1/+25
| | | | | | | | | | | | | | | | | | | | Patch taken from http://opensimulator.org/mantis/view.php?id=4905 originally by Greg C. Fixed to apply to r/23314 commit ba9daf849e7c8db48e7c03e7cdedb77776b2052f (cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
| * minor: Recomment out log message uncommented in previous cbdfe969Justin Clark-Casey (justincc)2013-09-211-4/+4
| |
| * When giving items between avatars in different simulators, only add the item ↵Oren Hurvitz2013-09-211-9/+44
| | | | | | | | | | | | to the receiving avatar's inventory once. When a user gives an item, the user's client sends an InventoryOffered IM message to its simulator. This adds the item to the receiver's inventory. If the receiver isn't in the same simulator then XMLRPC is used to forward the IM to the correct simulator. The bug was that the receiving simulator handled the message by calling OnInstantMessage() again, which added a second copy of the item to the inventory. Instead, the receiving simulator should only notify the avatar that the item was offered.
| * minor: Add prefix to log message in LureModuleJustin Clark-Casey (justincc)2013-09-211-1/+1
| |
| * minor: Correct minor spelling mistake Reseting -> Resetting in HG Map module ↵Justin Clark-Casey (justincc)2013-09-201-1/+1
| | | | | | | | log message
| * Make UUID.Zero resolve to "Unknown User" in user cache.Justin Clark-Casey (justincc)2013-09-201-0/+2
| | | | | | | | | | This is to avoid massive numbers of 'no user found' logs when user IDs are missing for some reason. UUID.Zero should not be used for any user ID.
| * For debug purposes, allow simulators to force use of earlier SIMULATION/0.1 ↵Justin Clark-Casey (justincc)2013-09-191-4/+49
| | | | | | | | | | | | | | | | teleport protocol even if SIMULATION/0.2 is available. This is specified in the MaxOutgoingTransferVersion attribute of [EntityTransfer] in OpenSim.ini, see OpenSimDefaults.ini for more details. Default remains "SIMULATION/0.2" Primarily for http://opensimulator.org/mantis/view.php?id=6755
| * refactor: rename *ChildAgentDataUpdate() methods to *UpdateChildAgent()Justin Clark-Casey (justincc)2013-09-181-3/+3
| | | | | | | | verb-noun is consistent with other similar methods
| * Reinstate insertion of "Unknown UserUMMAU4" now, as naive removing may be ↵Justin Clark-Casey (justincc)2013-09-171-35/+31
| | | | | | | | | | | | generating too many repeating user requests from other sources. Leaves in the dropping of the client GUN8 (now 9) uuid binding message, since this was the much more common case from the viewer-side and this can only affect viewers.
| * Comment out warning about no grid user found in ↵Justin Clark-Casey (justincc)2013-09-171-4/+4
| | | | | | | | UMM.TryGetUserNamesFromServices() for now
| * Fix issue in recent 3f0fa9f7 where the code start adding unknown user cache ↵Justin Clark-Casey (justincc)2013-09-171-2/+3
| | | | | | | | entries with no name
| * To avoid viewers (particularly on the Hypergrid) from permanently caching a ↵Justin Clark-Casey (justincc)2013-09-161-35/+42
| | | | | | | | | | | | | | UUID -> "Unknown User" binding, drop the binding request rather than replying with "Unknown User" By not binding UUID -> "Unknown User", we leave open the possibility that the binding may be correctly resolved at a later time, which can still happen in some Hypergrid situations. Observed behaviour of LL viewer 3.3.4 is that a dropped bind request is not retried until the next session.
| * Allow setting the EntityTransfer-max_distance to 0 to override distance ↵BlueWall2013-09-121-0/+3
| | | | | | | | checks. This is to facilitate current viewer work fixing the distance limitations for teleporting.
* | Merge branch 'avination-current' into careminsterMelanie2013-09-162-3/+5
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * | Harmonize the class name, ID and Name of the default perms moduleMelanie Thielker2013-09-081-3/+3
| | |
| * | * Fix a null ref that causes a stack unwind when crossing borders. Less ↵teravus2013-08-241-0/+2
| | | | | | | | | | | | | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
| * | Make attachment state load work againMelanie2013-08-011-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-09-076-22/+59
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Restore group membership check for HG users in QueryAccess.Diva Canto2013-09-051-4/+10
| | |
| * | Remove test that gives issue on Windows, just let the try/catch do the work.BlueWall2013-09-021-5/+1
| | |
| * | Fix bug where users teleporting to non-neighbour regions could continue to ↵Justin Clark-Casey (justincc)2013-09-022-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | hear chat from their source region for some time after teleport completion. This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat. This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running. This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
generated by cgit v1.1 at 2024-12-30 03:16:30 +0000