aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-173-38/+104
|\ | | | | | | | | 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
| * 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-151-5/+27
| | | | | | | | | | | | | | | | 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-144-16/+121
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-142-7/+1
| |
| * 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
* | Merge branch 'master' into bigmergeMelanie2011-11-061-0/+9
|\ \ | |/ | | | | | | | | | | | | | | | | 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-061-1/+1
| | | | | | | | packet per prim. More to come as we change to make use of this.
* | Merge branch 'master' into bigmergeMelanie2011-11-042-11/+11
|\ \ | |/ | | | | | | | | | | | | 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-031-1/+1
| | | | | | | | | | | | 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-033-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-032-21/+35
| |\
| * | Change default say distance to 20m from 30m, the same as on the big grid. ↵Justin Clark-Casey (justincc)2011-11-021-1/+1
| | | | | | | | | | | | | | | | | | 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-031-7/+21
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 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-021-7/+21
| |\ \ | | |/
| | * Fix race condition that would sometimes send or save appearance for the ↵Justin Clark-Casey (justincc)2011-11-021-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | wrong avatar. In AvatarFactoryModule.HandleAppearanceUpdateTimer(), we loop through appearance save and send requests and dispatch via a FireAndForget thread. If there was more than one request in the save or send queue, then this led to a subtle race condition where the foreach loop would load in the next KeyValuePair before the thread was dispatched. This gave the thread the wrong avatar ID, leaving some avatar appearance cloudy since appearance data was never sent. This change loads the fields into local references so that this doesn't happen.
| * | Port the Avination offline messaging system to CoreMelanie2011-11-022-21/+35
| |/
* | Fix the offline message module to revert core changes and restore avnMelanie2011-10-281-18/+28
| | | | | | | | specific behavior
* | Reduce severity and remove duplication if a common log message regardingMelanie2011-10-281-3/+1
| | | | | | | | baked textures
* | Merge branch 'master' into bigmergeMelanie2011-10-276-73/+57
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Removed use of 'is' operator and casting to find the root ScenePresence in ↵Dan Lake2011-10-272-68/+41
| | | | | | | | MessageTransfer modules and Groups module.
| * Continuation of previous checkin. Found more places where ↵Dan Lake2011-10-271-6/+4
| | | | | | | | ForEachScenePresence can be changed to ForEachRootScenePresence.
| * Added new ForEachRootScenePresence to Scene since almost every delegate ↵Dan Lake2011-10-272-7/+4
| | | | | | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
| * Comment out inventory folder bulk update code on InventoryAccepted message ↵Justin Clark-Casey (justincc)2011-10-271-12/+18
| | | | | | | | | | | | | | | | introduced in commit db91044 on Aug 22 2011 This should be unecessary since the folder update is already made at the time of the offer (and moved to trash if not accepted). This code was also not taking into account the situation where an item was accepted. Needs more fixing if this results in an aggression elsewhere.
* | Merge branch 'master' into bigmergeMelanie2011-10-264-1/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-254-1/+4
| | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
* | Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmergeMelanie2011-10-251-0/+1
|\ \ | |/
| * Fix missing Busy-Mode ResponsePixel Tomsen2011-10-221-0/+1
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5748
* | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmergeMelanie2011-10-252-268/+268
|\ \ | |/
| * Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line ↵Dan Lake2011-10-192-268/+268
| | | | | | | | endings from previous commit.
* | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-252-328/+300
|\ \ | |/
| * Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵Dan Lake2011-10-192-328/+300
| | | | | | | | scene presence by client ID.
* | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * remove now redundant m_physical_prim flag from SOP.ApplyPhysics()Justin Clark-Casey (justincc)2011-10-151-1/+1
| |
* | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmergeMelanie2011-10-251-4/+1
|\ \ | |/
| * factor common code out into SOP.RemoveFromPhysics()Justin Clark-Casey (justincc)2011-10-151-4/+1
| |
* | Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmergeMelanie2011-10-121-21/+4
|\ \ | |/
generated by cgit v1.1 at 2024-12-24 05:13:14 +0000