aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Intermediate commit. Sill errors.Melanie2014-01-055-37/+223
|\ | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| * varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs
| * Add routines in Util.cs for conversion of region handles to regionRobert Adams2014-01-042-1/+47
| | | | | | | | | | | | locations and for the conversion of region world location to region 'region' location. These routines will replace all the arithmatic scattered throughout OpenSimulator.
| * Add serialization/deserialization of region size to RegionInfo, GridRegion, ↵Robert Adams2013-12-282-37/+158
| | | | | | | | | | | | | | | | | | and RegionData. This does not modify interfaces or handling of variable sized regions. This only enables the loading and storing of the region size and the reporting of the region size in grid service responses. The database tables already have the code to load and store the region size.
| * Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-15/+15
| |\
| | * ParseNotecardToList() returned data past end of notecard text (mantis #6881).Kevin Cozens2013-12-141-15/+15
| | |
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-2/+2
| |\ \ | | |/
| | * After previous discussion, put eye-catcher 'SCRIPT READY' messages to ↵Justin Clark-Casey (justincc)2013-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | console rather than log as warning The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems. Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
| * | Add missing files *blush*Melanie2013-12-111-0/+157
| | |
| * | Committing the Avination Scene Presence and related texture codeMelanie2013-12-115-98/+237
| |/ | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
* | Revert "Add support for user preferences (im via email)"Melanie2013-12-071-8/+0
| | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
* | Merge branch 'master' into careminsterMelanie2013-12-071-0/+8
|\ \ | |/
| * Add support for user preferences (im via email)BlueWall2013-12-061-0/+8
| |
* | Merge branch 'master' into careminsterMelanie2013-11-238-10/+34
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * rename private field ACD.ViewerInternal to m_viewerInternal in line with ↵Justin Clark-Casey (justincc)2013-11-191-5/+6
| | | | | | | | conventions used elsewhere in code
| * Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has ↵Justin Clark-Casey (justincc)2013-11-191-1/+1
| | | | | | | | | | | | been set. Continue to return null instead.
| * Normalize viewer version string to accomodate new style version reporting in ↵Latif Khalifa2013-11-191-1/+24
| | | | | | | | the viewers
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-157-9/+9
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* | Merge branch 'master' into careminsterMelanie2013-11-081-1/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * Remove legacy sqlite lines added internally by OpenSimulator to the ↵Justin Clark-Casey (justincc)2013-10-281-1/+0
| | | | | | | | | | | | [Startup] section. These are long unused but confusingly will be seen in the [Startup] section on a "config save".
* | Merge branch 'master' into careminsterMelanie2013-11-035-0/+904
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * * Add a session concurrency option per key. Allows developer/config to ↵teravus2013-10-094-23/+102
| | | | | | | | specify number of concurrent requests on a service.
| * * Move the BasicDOSProtector.cs to OpenSim.Framework (all useful classes ↵teravus2013-10-071-1/+29
| | | | | | | | | | | | belong there.....) * Add an IsBlocked(string Key) method so it can be used more generically. (think.. if we want to rate limit login failures, we could have a call in the Login Service to IsBlocked(uuid.ToString()) and ignore the connection if it returns true, if IsBlocked returns false, we could run the login information and if the login fails we could run the Process method to count the login failures.
| * * Refactorteravus2013-10-074-410/+213
| | | | | | | | * Break out common BasicDOSProtector code into separate class.
| * * Added a Basic DOS protection container/base object for the most common ↵teravus2013-10-074-0/+994
| | | | | | | | | | | | | | | | | | 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-061-0/+1
|\ \ | | | | | | | | | careminster
| * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵teravus2013-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-0613-14/+77
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * * Add an initial complete frame timeout to the WebSocket processor to make ↵teravus2013-10-041-2/+65
| | | | | | | | it easier to write WebSocket service code that is resistant to Denial of Service attacks.
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-0412-12/+12
| |
* | Merge branch 'master' into careminsterMelanie2013-10-044-8/+35
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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.AddNewClient() to AddNewAgent() to make it obvious in ↵Justin Clark-Casey (justincc)2013-09-271-2/+2
| | | | | | | | the code that this is symmetric with CloseAgent()
| * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-271-5/+7
| | | | | | | | | | | | 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()
| * Don't use 'Indented' formatting for RpcXml responses.Aleric Inglewood2013-09-221-1/+15
| | | | | | | | (cherry picked from commit 93abcde69043b175071e0bb752538d9730433f1d)
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-221-0/+11
| | | | | | | | | | | | | | | | | | | | 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)
| * Make new regions PG by default instead of Mature.Justin Clark-Casey (justincc)2013-09-201-1/+1
| | | | | | | | | | This makes scripted object sounds and a few other things play by default instead of having to switch the viewer to adult This reduces the support burden
* | Merge branch 'master' into careminsterMelanie2013-09-072-8/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * minor simplification of some unix date functions in Util. No functional change.Justin Clark-Casey (justincc)2013-09-031-5/+3
| |
| * Add experimental "show grid users online" console command to show grid users ↵Justin Clark-Casey (justincc)2013-09-031-4/+4
| | | | | | | | | | | | | | | | online from a standalone/robust instance. This is not guaranteed to be accurate since users may be left "online" in certain situations. For example, if a simulator crashes and they never login/logout again. To counter this somewhat, only users continuously online for less than 5 days are shown.
| * Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵Justin Clark-Casey (justincc)2013-09-021-1/+2
| | | | | | | | | | | | | | | | | | | | allow different default regions for HG and direct grid logins. This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators. This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified then existing configured defaults will still work. Immediate use is for conference where we need to be able to specify different defaults However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
* | Merge branch 'master' into careminsterMelanie2013-09-012-3/+28
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * minor: Correct typo on "debug stats record start" messageJustin Clark-Casey (justincc)2013-08-231-1/+1
| |
| * Make it possible to disconnected a specified number of bots via the pCampbot ↵Justin Clark-Casey (justincc)2013-08-191-2/+27
| | | | | | | | | | | | | | console command "disconnect [<n>]" Bots disconnected are ascending from last in numeric order. Temporarily no way to reconnect bots.
* | Merge branch 'master' into careminsterMelanie2013-08-171-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * remove mono compiler warnings from PollServiceRequestManagerJustin Clark-Casey (justincc)2013-08-171-4/+2
| |
| * minor: remove mono compiler warning in StatsManagerJustin Clark-Casey (justincc)2013-08-171-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-08-118-152/+363
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Stats treaking. Update ToOSDMap for Stat and PercentageStat to returnRobert Adams2013-08-104-150/+235
| | | | | | | | | | all the various numbers that have been added to the console output. Break out EventHistogram from CounterStat.
| * Add parameter and explanation of ManagedStats return to OpenSimDefaults.ini.Robert Adams2013-08-081-0/+6
| | | | | | | | | | Add 'callback' query parameter to managed stats return to return function form of JSON data.
| * Add a JSON web fetch of the statististics managed by StatsManager.Robert Adams2013-08-081-0/+31
| | | | | | | | | | | | | | | | | | | | Disabled by default. Enable by setting [Startup]ManagedStatsRemoteFetchURI="Something" and thereafter "http://ServerHTTPPort/Something/" will return all the managed stats (equivilent to "show stats all" console command). Accepts queries "cat=", "cont=" and "stat=" to specify statistic category, container and statistic names. The special name "all" is the default and returns all values in that group.
generated by cgit v1.1 at 2024-11-20 03:35:56 +0000