aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Hypergrid: don't send Local assets to other gridsOren Hurvitz2014-04-231-35/+34
| | | | This commit also contains other changes, but they're all just for clarity. The only actual behavior change is to avoid Posting local assets.
* Removed GetUserInventory(). It wasn't being used, and was creating warnings ↵Oren Hurvitz2014-04-231-16/+0
| | | | because it's Obsolete.
* Eliminated many warningsOren Hurvitz2014-04-233-5/+1
|
* Better error-handling when storing assets: recognize that 'null' is an error ↵Oren Hurvitz2014-04-201-1/+1
| | | | value
* In teleports, when sending the Source region, set its ServerURI to the ↵Oren Hurvitz2014-04-132-2/+7
| | | | Gatekeeper URI (which is used with Regions); not the Home URI (which is used with Users)
* In teleports, pass the source region to the destination (similar to an HTTP ↵Oren Hurvitz2014-04-092-13/+20
| | | | referrer)
* Improved error messages when a teleport fails. The viewer's dialog already ↵Oren Hurvitz2014-04-081-4/+4
| | | | says "Teleport failed", so adding "Teleport refused" is redundant.
* When sending QueryAccess to a region, also send the user's Home URIOren Hurvitz2014-04-071-2/+5
|
* Refactored: use Scene.GetAgentHomeURI() to get the Home URI of a userOren Hurvitz2014-04-072-9/+2
|
* Fixed: during a teleport we always sent the error "The teleport destination ↵Oren Hurvitz2014-04-062-7/+1
| | | | | | could not be found" to the client. This happened on both success and failure. On successful teleports this error wasn't actually shown to the user. But on failed teleports this error could hide the true cause of the failure. For example, attempting to use a Landmark that's more than 4095 regions away would result in two warnings appearing in the viewer: "Region too far" and "Destination could not be found". The second message hid the first one, so it wasn't obvious to the user what is actually the problem.
* When preparing a Hypergrid teleport, tell the receiving grid which user is ↵Oren Hurvitz2014-04-062-5/+16
| | | | | | entering the grid. This can affect which region to use. E.g., returning users may be allowed to enter any region, whereas users from other grids will have to enter a gateway region. Previously per-user decisions were only made later, but by then it's too late to change which region the user enters.
* Pass the correct position to QueryAccess() instead of UUID.Zero (it was ↵Oren Hurvitz2014-04-061-1/+1
| | | | wrong in one place)
* When teleporting using Hypergrid, show more informative error messages in ↵Oren Hurvitz2014-04-032-10/+27
| | | | case of error
* BulletSim: make avatar physical shape to be a rectangle rather thanRobert Adams2014-04-021-5/+1
| | | | | | | | a capsule. Set the default to be the rectangle shape and adjust the parameters in OpenSimDefaults.ini for the new shape. The rectangle shape will perform better and avatar height can be computed more accurately.
* Wrap contents of ETM.CrossAgentToNewRegionAsync() in try/catch to avoid a ↵Justin Clark-Casey (justincc)2014-04-031-13/+19
| | | | | | failure terminating simulators running on Windows In relation to http://opensimulator.org/mantis/view.php?id=7050
* Added assets service method AssetsExist(), which returns whether the given ↵Oren Hurvitz2014-04-021-20/+49
| | | | | | list of assets exist. This method is used to optimize sending assets with embedded assets: e.g., when a Hypergrid visitor takes an item into the inventory.
* When searching for users, don't add users from the local cache if they have ↵Oren Hurvitz2014-03-241-2/+3
| | | | | | an invalid UUID Resolves http://opensimulator.org/mantis/view.php?id=6935
* Trim search queries (for users, groups, etc.). I have found that sometimes ↵Oren Hurvitz2014-03-241-1/+3
| | | | | | the viewer adds a space at the end, which causes searches to fail. Resolves http://opensimulator.org/mantis/view.php?id=6935
* Add regression test for http inventory fetch.Justin Clark-Casey (justincc)2014-03-171-0/+4
| | | | Involved some restructuring to allow regression tests to dequeue inventory requests and perform poll responses synchronously rather than async
* After an object with KeyframeMotion is copied into inventory, resume the ↵Oren Hurvitz2014-03-111-2/+15
| | | | motion (previously it remained stopped)
* add newRegion parameter to CrossAgentToNewRegion event and trigger the event ↵dahlia2014-02-201-0/+2
| | | | after crossing thread is invoked
* Properly restore position on crossing failure for mega-regions.Robert Adams2014-02-151-6/+15
| | | | | Fix odd "cannot cross into banned parcel" viewer error message when crossing into non-existant region. Proper permission failure messages are now returned.
* Rewrite of mega-region code to use new form of border checking.Robert Adams2014-02-151-34/+14
| | | | | | | This commit eliminates all of the 'border' class and list code and replaces it with testing if in the current region. Impacts: can make a mega-region out of varregions of the same size; and mega-region combinations must be rectangular (not square but rectangular)
* Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-02-143-4/+33
|\
| * Change warns associated with UserAgentServiceConnector to debugs, as this is ↵Justin Clark-Casey (justincc)2014-02-143-3/+3
| | | | | | | | | | | | not necessarily a problen with the source simulator (e.g. someone else's remote simulator cannot be contacted). This is Oren Hurvitz's second patch from http://opensimulator.org/mantis/view.php?id=6956 with a small amount of correction
| * If calls to UserAgentServiceConnector fail then throw an exception. This ↵Justin Clark-Casey (justincc)2014-02-143-4/+33
| | | | | | | | | | | | lets the caller decide whether to discard the error or not. This is Oren Hurvitz's 0001 patch from http://opensimulator.org/mantis/view.php?id=6956 but I ended up doing some tweaking to resolve patch application issues.
* | varregion: enable teleporting to a varregion by clicking on the map andRobert Adams2014-01-261-3/+28
| | | | | | | | | | | | | | pressing the 'teleport' button. This commit adds returning region map info for all the subregions of a varregion. This also handles the selection of the extra region and then the displacement of the postion so the teleport is to the correct location.
* | Merge branch 'master' into varregionRobert Adams2014-01-212-6/+6
|\ \
| * | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-202-6/+6
| | | | | | | | | | | | | | | | | | "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'.
* | | Merge branch 'master' into varregionRobert Adams2014-01-191-1/+1
|\ \ \ | |/ /
| * | minor: since structs are values, assigning them to another variable copies ↵Justin Clark-Casey (justincc)2014-01-171-1/+1
| | | | | | | | | | | | it. Instantiation is unnecessary.
* | | Merge branch 'master' into varregionRobert Adams2014-01-111-60/+55
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneBase.cs OpenSim/Services/Interfaces/IGridService.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs (conflicts were debug statements that are commented out in master branch)
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-101-60/+55
| |\ \ | | |/
| | * When creating a coalesced object, set its permissions to the ↵Oren Hurvitz2014-01-101-7/+16
| | | | | | | | | | | | lowest-common-denominator of all the sub-objects
| | * When creating a coalesced object, set its Creator ID if all the objects have ↵Oren Hurvitz2014-01-101-4/+15
| | | | | | | | | | | | the same creator
| | * Refactored: use a single function to apply an object's folded permissions to ↵Oren Hurvitz2014-01-101-11/+9
| | | | | | | | | | | | its main permissions
| | * Refactored setting permissions when rezzing items: use the same function ↵Oren Hurvitz2014-01-101-37/+14
| | | | | | | | | | | | | | | | | | 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.)
| * | Some missing definitions needed for successful compilation.Robert Adams2014-01-041-1/+2
| | |
| * | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-041-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-031-11/+21
| | | | | | | | | | | | | | | | | | | | | 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).
* | | varregion: extract banned region logic into a class for cleanlyness.Robert Adams2013-12-271-33/+174
| | | | | | | | | | | | | | | Add 'not found' caching in EntityTransferModule.GetRegionContainingWorldLocation so hitting borders and bad teleports do not continuiously hammer on the GridService.
* | | varregion: many more updates removing the constant RegionSize and replacingRobert Adams2013-12-261-22/+21
| | | | | | | | | | | | with a passed region size. This time in the map code and grid services code.
* | | varregion: add lots of DEBUG level log messages. Especially for teleport.Robert Adams2013-12-242-1/+7
| | |
* | | varregion: fix bug where destination region is not found and object isRobert Adams2013-12-241-47/+61
| | | | | | | | | | | | not restored to its original location.
* | | Merge branch 'master' into varregionRobert Adams2013-12-171-503/+235
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Add new region crossing code to varregion Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | This is the Avination Entity Transfer Module. Surprisingly, it still compilesMelanie2013-12-111-217/+204
| |/ | | | | | | | | but I don't know if it runs. Will probably crash and burn as the supporting code isn't there yet.
* | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.Robert Adams2013-12-141-12/+12
| | | | | | | | | | | | 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-301-60/+158
| | | | | | | | | | Intermediate checkin of changing border cross computation from checking boundry limits to requests to GridService. Not totally functional.
* | Merge branch 'master' into varregionRobert Adams2013-11-152-3/+3
|\ \ | |/
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-152-3/+3
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845