aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-12-052-103/+109
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-032-5/+5
| | | | | | | | | | This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate. Normal standalone operation unaffected.
| * Stop some places where we're trying to reset animations in child agents ↵Justin Clark-Casey (justincc)2011-12-021-100/+110
| | | | | | | | where such requests are ignored.
* | Strip CR from http responses and limit them to 2048 charsMelanie2011-12-051-1/+3
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-012-9/+13
|\ \ | |/
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+1
| |
| * Improve some of the debug help messagesJustin Clark-Casey (justincc)2011-11-291-3/+2
| |
| * tabulate "show caps" output for easier readabilityJustin Clark-Casey (justincc)2011-11-291-5/+10
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-281-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Add disabled CrossBehaviour to pCampBot, which is designed to cross test ↵Justin Clark-Casey (justincc)2011-11-241-1/+1
| | | | | | | | | | | | bots between neighbouring regions. Not yet enabled since there is a bug where the initial cross will work but all subsequent movements on the receiving simulator appear to fail.
* | Merge branch 'master' into bigmergeMelanie2011-11-193-25/+42
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for ↵Justin Clark-Casey (justincc)2011-11-191-1/+0
| | | | | | | | | | | | | | SendCreateChildAgent" message This is misleading since a simulator will call this method before successfully trying remote regions. Also comments out spammy "[SIMULATION]: Stream handler called" AgentHandlers messages for now.
| * minor: Make HelloNeighbour messages more informativeJustin Clark-Casey (justincc)2011-11-191-5/+10
| |
| * For TerrainModule.SaveToFile(), don't bother throwing the exception onwards ↵Justin Clark-Casey (justincc)2011-11-171-1/+0
| | | | | | | | | | | | after printing out the error, since this method is invoked by users. Still throwing the exception on the stream method since this invoked programatically
| * Make "terrain save" more friendly by telling the user if we have saved and ↵Justin Clark-Casey (justincc)2011-11-171-18/+32
| | | | | | | | putting out a useful complaint message if we haven't for some reason
* | Merge branch 'master' into bigmergeMelanie2011-11-176-80/+177
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Comment out the vebose logging on HGFriendsModule.Justin Clark-Casey (justincc)2011-11-161-12/+11
| | | | | | | | Recent issues in http://opensimulator.org/mantis/view.php?id=5794 were not related to HG friends
| * Fix the build breakJustin Clark-Casey (justincc)2011-11-161-1/+1
| |
| * Look up a homeURL only when it's not null, in addition to not being string.EmptyJustin Clark-Casey (justincc)2011-11-161-1/+1
| |
| * Enable log message to tell us what type of url is being requested from a ↵Justin Clark-Casey (justincc)2011-11-151-3/+3
| | | | | | | | user's homeurl
| * Make tracked per scene thread names conform to the majorirty format.Justin Clark-Casey (justincc)2011-11-151-3/+6
| | | | | | | | This is <thread-name> (<region-name>)
| * fix build break on UserManagementModule.Justin Clark-Casey (justincc)2011-11-151-7/+8
| | | | | | | | This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
| * Do proper locking of UserManagementModule.m_UserCache when getting.Justin Clark-Casey (justincc)2011-11-151-29/+57
| | | | | | | | | | | | | | | | This might help with [USER AGENT CONNECTOR]: new connector to () [USER AGENT CONNECTOR]: Unable to contact remote server for GetServerURLs [USER AGENT CONNECTOR]: Malformed Uri : Argument cannot be null. Parameter name: uriString
| * temporarily increasing logging in HGFriendsModule for debuggingJustin Clark-Casey (justincc)2011-11-151-1/+24
| |
| * Add comments about trying to avoid synchronous work off the ↵Justin Clark-Casey (justincc)2011-11-151-1/+4
| | | | | | | | EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another.
| * remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is ↵Justin Clark-Casey (justincc)2011-11-151-1/+0
| | | | | | | | not being used any more - it's now IEntityTransferModule and SimulationService instead
| * Rename FetchFriendslist() -> CacheFriends() and RefetchFriends() -> ↵Justin Clark-Casey (justincc)2011-11-152-15/+13
| | | | | | | | RecacheFriends() to reflect their intended function
| * refactor: rename m_NeedsListOfFriends => m_NeedsListOfOnlineFriends to ↵Justin Clark-Casey (justincc)2011-11-151-5/+5
| | | | | | | | better reflect its actual function
| * For clients that are entering a simulator from initial login, stop executing ↵Justin Clark-Casey (justincc)2011-11-152-7/+28
| | | | | | | | | | | | | | | | FriendsModule.FetchFriendslist() asychronously. Executing this asynchronously allows a race condition where subsequent friends fetches hit a cache that FetchFriendsList() had not yet populated. Changing this to synchronous may improve issues where a user does not see friends as online even though they are. I don't believe synchronous is a problem here, but if it is, then a more complicated signalling mechanism is required. Locking the cache isn't sufficient.
| * refactor: Don't create a new UUID for passing uuids to client - UUIDs are ↵Justin Clark-Casey (justincc)2011-11-151-4/+6
| | | | | | | | structs are so not passed by reference (and they're immutable!)
| * Add test for removing a friendship.Justin Clark-Casey (justincc)2011-11-142-11/+31
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-142-4/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneViewer.cs
| * Improved method doc for AddFriend() - it actually does set up a two-way ↵Justin Clark-Casey (justincc)2011-11-142-4/+5
| | | | | | | | | | | | relationship. Rename IFriendsModule.AddFriend() to AddFriendship()
* | Fix build breakMelanie2011-11-141-2/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-146-20/+122
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-144-11/+2
| |
| * Add test for adding a friend whilst onlineJustin Clark-Casey (justincc)2011-11-142-6/+30
| |
| * Add very simple FriendsModuleTests.TestNoFriends()Justin Clark-Casey (justincc)2011-11-142-1/+81
| |
| * If a friends identifier which is too short is given to ↵Justin Clark-Casey (justincc)2011-11-141-1/+8
| | | | | | | | | | | | HGFriendsModule.GetOnlineFriends() then spit out a warning rather than failing on the String.Substring(). This is to progress http://opensimulator.org/mantis/view.php?id=5789
| * Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to ↵Justin Clark-Casey (justincc)2011-11-141-1/+2
| | | | | | | | | | | | stop a NullReferenceException being thrown if an HG IM is sent to a simulator running multiple regions This is an attempt to address http://opensimulator.org/mantis/view.php?id=5791
* | Fix taking or returning locked objects losing permissions for ownerMelanie2011-11-121-1/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-062-1/+10
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-062-2/+2
| | | | | | | | packet per prim. More to come as we change to make use of this.
* | Merge branch 'master' into bigmergeMelanie2011-11-047-55/+37
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-034-6/+6
| | | | | | | | | | | | from previous commit which sort out which iterator is used are left intact. A discussion is needed as to what constitutes an avatar vs a ScenePresence.
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-0310-65/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the 3 iteration functions so more of them are using the correct iteration for the action they are performing. The 3 iterators that seem to fit all actions within OpenSim at this time are: ForEachAvatar: Perform an action on all avatars (root presences) ForEachClient: Perform an action on all clients (root or child clients) ForEachRootClient: Perform an action on all clients that have an avatar There are still a dozen places or so calling the old ForEachScenePresence that will take a little more refactoring to eliminate.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-033-22/+36
| |\
| * | Change default say distance to 20m from 30m, the same as on the big grid. ↵Justin Clark-Casey (justincc)2011-11-022-2/+2
| | | | | | | | | | | | | | | | | | This is to improve the migration of scripts that expect a 20m say distance. If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
* | | Merge branch 'master' into bigmergeMelanie2011-11-034-13/+30
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-024-13/+30
| |\ \
generated by cgit v1.1 at 2025-01-03 16:10:13 +0000