aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-2755-940/+2338
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * minor: code formatting from 0b72f773Justin Clark-Casey (justincc)2012-05-261-12/+11
| |
| * Mantis 6025 llRequestPermissions auto grant for NPCs.Talun2012-05-261-1/+23
| | | | | | | | | | | | If the script requesting permissions is owned by either the NPC or the NPCs owner (if the NPC is created as owned) then grant any permissions automatically.
| * If restating a region, clean up the physics scene after the main scene has ↵Justin Clark-Casey (justincc)2012-05-261-4/+4
| | | | | | | | | | | | | | | | been closed not before. If this is done before then on ODE agent update calls still incoming can fail as they try to use a raycastmanager that has been disposed. Bullet plugin does nothing on Dispose() However, I wouldn't be at all surprised if individual region restarting was buggy in lots of other areas.
| * Add Blake/Techplex to CONTRIBUTORS. Thanks!Justin Clark-Casey (justincc)2012-05-261-0/+1
| |
| * One can now get hyoergrid region co-ordinates with llRequestSimulatorDataBlake.Bourque2012-05-261-5/+21
| |
| * Use GetInventoryItem() in LSL_Api.InventoryKey(string name, int type).Justin Clark-Casey (justincc)2012-05-261-17/+7
| | | | | | | | Also removes small bug where calling this method would add 1 to LPS, evne though all callers already did this.
| * Use SceneObjectPartInventory.GetInventoryItem() in OSSL.AvatarStopAnimation ↵Justin Clark-Casey (justincc)2012-05-261-14/+12
| | | | | | | | instead of searching the task inventory manually.
| * refactor: replace LSL_Api.InventoryKey(string) largely with ↵Justin Clark-Casey (justincc)2012-05-263-45/+42
| | | | | | | | | | | | SceneObjectPartInventory.GetInventoryItem(string) Also gets llStopAnimation() to call KeyOrName rather than duplicating logic.
| * Mantis 6028 osAvatarStopAnimation not stopping animations via UUIDTalun2012-05-251-7/+11
| | | | | | | | | | Corrected to stop animations using the animation UUID similar to llStopAnimation. See http://opensimulator.org/wiki/OsAvatarStopAnimation
| * Resolve some mono compiler warnings.Justin Clark-Casey (justincc)2012-05-259-26/+33
| |
| * on agent cross, remove from physics scene after its been placed in transit, ↵Justin Clark-Casey (justincc)2012-05-251-3/+7
| | | | | | | | not before.
| * refactor: make ETM.CrossAgentToNewRegionAsync neighbourRegion == null check ↵Justin Clark-Casey (justincc)2012-05-251-90/+92
| | | | | | | | return earlier to simplify method
| * Remove a call stack debugging line accidentally left in from a few days ago ↵Justin Clark-Casey (justincc)2012-05-251-2/+0
| | | | | | | | at SceneObjectPartInventory.ApplyNextOwnerPermissions().
| * Fix bug where a failed QueryAccess to a remove region would always have the ↵Justin Clark-Casey (justincc)2012-05-252-15/+21
| | | | | | | | reason "Communications failure" no matter what the destination region actually returned
| * Stop it being possible for an agent to teleport back to its source region ↵Justin Clark-Casey (justincc)2012-05-253-28/+169
| | | | | | | | | | | | | | | | | | before the source region has finished cleaning up old agent data and structures. If this is allowed, then the client usually gets forcibly logged out and data structures might be put into bad states. To prevent this, the binary state machine of EMT.m_agentsInTransit is replaced with a 4 state machine (Preparing, Transferring, ReceivedAtDestination, CleaningUp). This is necessary because the source region needs to know when the destination region has received the user but a teleport back cannot happen until the source region has cleaned up. Tested on standalone, grid and with v1 and v3 clients.
| * In remote QueryAccess, also receive the actual status (true|false) instead ↵Justin Clark-Casey (justincc)2012-05-252-2/+9
| | | | | | | | | | | | | | | | | | | | of always true no matter what the callee actually returned. This was due to two things 1) SimulationServiceConnector.QueryAccess was always looking to the outer result["success"]. But if a "_Result" map is returned (which is certainly the case right now), then the true success is _Result["success"], result["success"] is always true no matter what 2) If QueryAccess was false at the destination, then AgentHandlers.DoQueryAccess() was never putting this in the result. The default action of SerializeJsonString() is not to put false booleans in the JSON!!!, so this has to be explicitly set.
| * Don't actually proceed on a within-region teleport if another is already ↵Justin Clark-Casey (justincc)2012-05-241-0/+2
| | | | | | | | | | | | taking place, rather than just (falsely) logging that we're not going to proceed. An oversight from recent commit 9ab0c81
| * On inter-region teleport, only stand the avatar up if the QueryAccess call ↵Justin Clark-Casey (justincc)2012-05-241-7/+7
| | | | | | | | to the destination scene actually succeeds.
| * Now that the EntityTransferModule is per-region, fetch the event queue ↵Justin Clark-Casey (justincc)2012-05-241-18/+22
| | | | | | | | module once rather than repeatedly via scene presences
| * Fix issue where a dns resolution failure on the final destination might ↵Justin Clark-Casey (justincc)2012-05-241-192/+200
| | | | | | | | | | | | leave the user unable to teleport since the transit flag was not being reset. This moves the 'already in transit' check further up and resets the flag if dns resolution fails and in the new required places.
| * adding status codes from rfc 6585SignpostMarv2012-05-241-2/+22
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * porting IDE tooltip-friendly documentation tweaks from Aurora-SimSignpostMarv2012-05-241-134/+223
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Comment out accidentally left in log line that was printing out the control ↵Justin Clark-Casey (justincc)2012-05-241-3/+3
| | | | | | | | file on OAR save
| * Make ISimulationScene.GetScene() used the more efficient region id for ↵Justin Clark-Casey (justincc)2012-05-246-13/+31
| | | | | | | | lookup rather than the region handle.
| * If an agent is still registered as 'in transit' by the source region, don't ↵Justin Clark-Casey (justincc)2012-05-246-193/+233
| | | | | | | | | | | | | | | | | | | | | | | | allow an immediate teleport back. This is to help relieve a race condition when an agent teleports then immediately attempts to teleport back before the source region has properly cleaned up/demoted the old ScenePresence. This is rare in viewers but much more possible via scripting or region module. However, more needs to be done since virtually all clean up happens after the transit flag is cleared . Possibly need to add a 'cleaning up' state to in transit. This change required making the EntityTransferModule and HGEntityTransferModule per-region rather than shared, in order to allow separate transit lists. Changes were also required in LocalSimulationConnector. Tested in standalone, grid and with local and remote region crossings with attachments.
| * Environment Module - allows Environment settings for Viewer3 warning: ↵PixelTomsen2012-05-2315-3/+703
| | | | | | | | | | | | | | | | | | | | | | | | | | includes database region store migrations for mssql, mysql, sqlite enable/disable this module: Cap_EnvironmentSettings = "localhost" (for enable) Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file) or owerwrite in OpenSim.ini mantis: http://opensimulator.org/mantis/view.php?id=5860 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Format cleanupBlueWall2012-05-231-2/+2
| |
| * Fix llGetSimulatorHostname to return configured hostnameBlueWall2012-05-233-1/+7
| |
| * minor: Change [OBJECT COMMANDS MODULE] log strings to [REGION COMMANDS ↵Justin Clark-Casey (justincc)2012-05-231-6/+6
| | | | | | | | MODULE] strings, though all these are currently commented out anyway
| * Add "show scene" command which lists stats for the currently selected ↵Justin Clark-Casey (justincc)2012-05-232-1/+161
| | | | | | | | | | | | | | | | | | | | console scene(s) This includes prim count, script count, avatar count, etc. Information is currently the same as "show stats", though show stats can only show one scene at a time because it listens for the latest outgoing stats packet (a bad approach that needs to change). Might be better to tie this module into the other stats module to display arbitrary stats rather than fetching directly from scene.SimStatsReporter. Console command is "show scene" because "show region" already exists for the grid service, which is unfortunate. Might need to make a distinction between "scene" relating to a live scene and "region" relating to more static region data (url, coords, etc.)
| * refactor: Rename ConsoleTableRow and ConsoleTableColumn to ↵Justin Clark-Casey (justincc)2012-05-232-15/+15
| | | | | | | | ConsoleDisplayTableRow and ConsoleDisplayTableColumn
| * Add ConsoleDisplayList for more consistent formatting of console output in ↵Justin Clark-Casey (justincc)2012-05-232-9/+121
| | | | | | | | | | | | list form. Convert "show region" to use this structure rather than hand-constructing
| * refactor: rename ConsoleTable -> ConsoleDisplayTable for clarityJustin Clark-Casey (justincc)2012-05-232-3/+3
| |
| * Add missing Y co-ord in "show region" console command informationJustin Clark-Casey (justincc)2012-05-231-1/+1
| |
| * Lay out "show region" information in an easier to read line by line formatJustin Clark-Casey (justincc)2012-05-231-9/+11
| |
| * Fetch the dialog module reference in AttachmentsModule in RegionLoaded() not ↵Justin Clark-Casey (justincc)2012-05-231-1/+1
| | | | | | | | | | | | AddRegion() The reference is not guaranteed to be there when AddRegion() is called but will definitely be present at RegionLoaded() if it's going to be present at all.
| * minor: Make log class names in InventoryAccessModule uniformJustin Clark-Casey (justincc)2012-05-231-10/+10
| |
| * Fix bug where an avatar that had an object they owned attached through ↵Justin Clark-Casey (justincc)2012-05-238-169/+155
| | | | | | | | | | | | | | llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene. This is because the attachments module code was setting the 'object slam' bit by using PermissionMask.All Solution here is to route the attachment item creation call through the existing inventory code in BasicInventoryAccessModule rather than copy/pasted code in AttachmentsModule itself.
| * Setting 'in transit' on a local teleport as well as inter-region teleports.Justin Clark-Casey (justincc)2012-05-211-0/+9
| | | | | | | | | | This is to eliminate possible race conditions if two teleport calls are made concurrently, where at least one is a local teleport. This is pretty much impossible on a manual user teleport but can happen on script-invoked teleports.
| * minor: extend commented out LinkInventoryItem log message for future useJustin Clark-Casey (justincc)2012-05-212-8/+8
| |
| * Fix bug where outfit folders could not be renamed.Justin Clark-Casey (justincc)2012-05-211-4/+13
| | | | | | | | Outfit folders are a type of system folder whose details are allowed to change.
* | Merge branch 'master' into careminsterMelanie2012-05-194-176/+243
|\ \ | |/
| * Improve locking of RegionCombinerModule.m_regionsJustin Clark-Casey (justincc)2012-05-191-24/+29
| |
| * Add size of region to OAR control file. Megaregions (sw root OARs when ↵Justin Clark-Casey (justincc)2012-05-193-17/+56
| | | | | | | | | | | | saved) will have a size larger than 256x256 Not yet read. Do not rely on this information yet, it may change.
| * refactor: Add RegionConnection.PosX and PosY to return position in meters ↵Justin Clark-Casey (justincc)2012-05-192-30/+43
| | | | | | | | rather than copy/pasting the necessary calculations in lots of places.
| * refactor: Rename connection paramaters from "conn" and "regionConnections" ↵Justin Clark-Casey (justincc)2012-05-191-127/+133
| | | | | | | | so that it's easy to tell whether they refer to the root region connection or a new region connection
| * Correct some log messages in RegionCombinerModule about the position of the ↵Justin Clark-Casey (justincc)2012-05-191-5/+3
| | | | | | | | root region of a megaregion relative to an added region
| * Make the megaregion total area given to the physics module accurate instead ↵Justin Clark-Casey (justincc)2012-05-191-3/+9
| | | | | | | | | | | | | | of over-inflated. This was previously over-inflated because adding a region to the NE of the root region resulted in double counting of regions already added. An accurate extent will also be necessary for other purposes.
* | Merge branch 'master' into careminsterMelanie2012-05-1915-130/+388
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs