aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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
| * Add support for user preferences (im via email)BlueWall2013-12-061-0/+8
| |
* | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.Robert Adams2013-12-141-46/+22
| | | | | | | | | | | | Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z. This keeps the downward compatibility and follows the scheme of 'region' and 'world' location naming that is happening in the Util module.
* | varregion: Add MaxRegionSize constant and enforce in RegionInfo.Robert Adams2013-11-302-2/+13
| | | | | | | | | | Intermediate checkin of changing border cross computation from checking boundry limits to requests to GridService. Not totally functional.
* | varregion: many replacements of in-place arithmetic with calls toRobert Adams2013-11-281-0/+1
| | | | | | | | | | the Util functions for converting world addresses to region addresses and converting region handles to locations.
* | Merge branch 'master' into varregionRobert Adams2013-11-241-1/+25
|\ \ | |/
| * 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
* | Merge branch 'master' into varregionRobert Adams2013-11-157-9/+9
|\ \ | |/
| * 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
* | varregion: fix GetLandObject error return and initialization of squareRobert Adams2013-11-101-2/+4
| | | | | | | | | | | | land object bitmaps. This fixes creation of child presences and the editing of parcels. Also lots of commented out debugging messages.
* | varregion: elimination of Constants.RegionSize from all over OpenSimulator.Robert Adams2013-11-083-7/+48
| | | | | | | | | | | | | | Routines in Util to compute region world coordinates from region coordinates as well as the conversion to and from region handles. These routines have replaced a lot of math scattered throughout the simulator. Should be no functional changes.
* | varregion: properly sense size of terrain heightmap and store asRobert Adams2013-11-051-4/+15
| | | | | | | | compressed 2D database blob if a varregion.
* | Merge branch 'master' into varregionRobert Adams2013-11-041-1/+0
|\ \ | |/
| * 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".
* | varregion: Enforce the configuration of square regions in RegionInfo.cs.Robert Adams2013-11-021-3/+15
| |
* | varregion: fix lawn-mower terrain fill so it works for non-square regions.Robert Adams2013-11-011-2/+2
| | | | | | | | Add some debugging logs on region creation to report region size.
* | varregion: enforce multiple of 256 for region size when parameters fetched ↵Robert Adams2013-11-011-0/+33
| | | | | | | | | | | | from user. Output info and warning messages for non-legacy region sizes.
* | varregion: push TerrainData implementation up and down the database storage ↵Robert Adams2013-11-011-24/+169
| | | | | | | | | | | | | | stack. Implement both LoadTerrain and StoreTerrain for all DBs. Move all database blob serialization/deserialization into TerrainData.
* | varregion: fix problem of X/Y dimensions swapped and incorrect terrainRobert Adams2013-10-311-1/+1
| | | | | | | | | | compression base computation. Complete replacement of float[] for terrain heightmap with TerrainData instance.
* | Merge branch 'master' into varregionRobert Adams2013-10-165-0/+904
|\ \ | |/
| * * 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.
* | varregion: move the compressed heighmap compression factor fromRobert Adams2013-10-162-15/+30
| | | | | | | | | | Constants into TerrainData. Save compression factor with the terrain blob in the database.
* | Merge branch 'master' into varregionRobert Adams2013-10-0713-14/+77
|\ \ | |/
| * * 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
| |
* | varregion: plug in TerrainData class and modify TerrainModule and ↵Robert Adams2013-10-072-12/+103
| | | | | | | | LLClientView to use same. This passes a terrain info class around rather than passing a one dimensional array thus allowing variable regions. Update the database storage for variable region sizes. This should be downward compatible (same format for 256x256 regions).
* | varregion: add new TerrainData and TerrainCompressor routines. ↵Robert Adams2013-10-071-0/+152
| | | | | | | | TerrainCompressor needed to replace the one in libopenmetaverse that doesn't know about the larger terrain packets.
* | varregion: serious rework of TerrainChannel:Robert Adams2013-09-282-13/+21
| | | | | | | | | | | | | | | | | | -- addition of varaible region size in X and Y -- internal storage of heightmap changed from double[] to short[] -- helper routines for handling internal structure while keeping existing API -- to and from XML that adds region size information (for downward compatibility, output in the legacy XML format if X and Y are 256) Updated and commented Constants.RegionSize but didn't change the name for compatibility.
* | varregion: go back to using Constants.RegionSize so as not to breakRobert Adams2013-09-281-20/+13
| | | | | | | | | | external modules. People shouldn't use it but don't want to cause too much breakage of legacy modules.
* | VarRegion: add RegionSize[XYZ] to RegionInfo.cs.Robert Adams2013-09-281-23/+78
| | | | | | | | | | Update RegionInfo parameter and serialization routines to serialize the region size if it is not the LegacyRegionSize.
* | VarRegion: change RegionInfo storage of region coordinates from regionRobert Adams2013-09-281-23/+59
|/ | | | | | | | count number to integer world coordinates. Added new methods RegionWorldLoc[XY]. Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim. Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability of external region management packages.
* 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
* 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.
* 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.