aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* MESS: changes in MakeRootAgent and CompleteMovement reordering things.UbitUmarov2014-07-311-0/+2
| | | | | | Added sending of land overlay and parcel information. This in order to only send avatar related information after having its position well defined and on the right parcel. THIS MAY STILL BE BAD :)
* missing file in commit 5fe1f878372b5490304a2ad7c0a41293ae36aaa0UbitUmarov2014-07-301-1/+1
|
* Try to plumb the other halfMelanie Thielker2014-07-291-0/+3
|
* Send new parcel permissions to activate viewer options - done right this timeMelanie Thielker2014-07-291-10/+20
|
* change previus code, send a NoEvents response back to http server, evenUbitUmarov2014-07-241-3/+0
| | | | | if we know there is no one there, so that the server finishes handling it.
* let BlockingQueue timeout work as its suposed to and not wait for everUbitUmarov2014-07-241-3/+2
|
* request.DoHTTPGruntWork(..) is now identical to our version, so useUbitUmarov2014-07-231-40/+5
| | | | | those again, getting code closer to os again
* Merge branch 'avination-current'Melanie Thielker2014-07-191-1/+6
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * Merge branch 'avination-current' into ubitworkUbitUmarov2014-07-165-7/+29
| |\
| * \ Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-082-319/+0
| |\ \
| * | | add indexes for new visual parameters shape_hover andUbitUmarov2013-06-071-1/+6
| | | | | | | | | | | | | | | | | | | | APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for now
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2182-663/+4118
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * | | Merge branch 'master' into careminsterMelanie2014-01-285-24/+70
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * \ \ Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-201-14/+7
| | |\ \ \
| | | * | | Stop exceptions being generated on agent connection if a telehub object has ↵Justin Clark-Casey (justincc)2014-01-201-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | been deleted or has no spawn points.
| | * | | | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-202-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
| | * | | | Fix casting error for float type INI file parameter parsing.Robert Adams2014-01-191-1/+1
| | | | | |
| | * | | | minor: Add method doc to IImproveAssetCacheJustin Clark-Casey (justincc)2014-01-181-1/+25
| | | | | |
| * | | | | Merge branch 'master' into careminsterMelanie2014-01-282-1/+90
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-111-1/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.Oren Hurvitz2014-01-111-1/+3
| | | | | |
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-101-0/+87
| | |\ \ \ \ | | | |/ / /
| | | * | | Refactored: use a single function to apply an object's folded permissions to ↵Oren Hurvitz2014-01-101-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | its main permissions
| | | * | | Refactored setting permissions when rezzing items: use the same function ↵Oren Hurvitz2014-01-101-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when rezzing from user inventory and prim inventory. Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
| | | * | | Add missing viewer param elements for butt and breast physics.Justin Clark-Casey (justincc)2013-12-191-1/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from http://opensimulator.org/mantis/view.php?id=6864 except with tabs replaced by spaces Thanks cinderblocks!
| * | | | | 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.
generated by cgit v1.1 at 2024-10-20 19:43:15 +0000