aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-211-2/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Merge branch 'master' into careminsterMelanie2013-07-291-2/+2
| |\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * Several major improvements to group (V2) chat. Specifically: handle ↵Diva Canto2013-07-271-2/+2
| | | | | | | | | | | | | | | | | | join/drop appropriately, invitechatboxes. The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
| | * Prevent an exception if no offline messages were retrieved.Kevin Cozens2013-06-181-0/+3
| | |
* | | Change OfflineMessageModule to support more differentiated return values and ↵Melanie Thielker2014-04-061-8/+47
|/ / | | | | | | allow support for mobile devices and other non-viewer logins
* | Merge branch 'master' into careminsterMelanie2012-12-071-5/+5
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: also comment out the debug log message which reports searching for ↵Justin Clark-Casey (justincc)2012-12-041-2/+2
| | | | | | | | child agents in simulator scenes for now.
| * minor: Comment out "Delivering IM to..." messages for now.Justin Clark-Casey (justincc)2012-12-041-3/+3
| |
| * Bug fix in OfflineMessageModule. Mantis #6446Diva Canto2012-12-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-11-301-14/+18
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * Bug fix in Offline IM for inventory transfers. The items were being placed ↵Diva Canto2012-11-271-11/+15
| | | | | | | | twice in the receiver's inventory.
* | Merge branch 'master' into careminsterMelanie2012-11-135-0/+10
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-135-0/+10
| |
* | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-121-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-11-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-121-1/+1
| | | | | | | | grepping for remaining uses
* | Fix perms when linking an object. Set root part perms to the permsMelanie2012-10-141-1/+1
| | | | | | | | | | of the link set to make the build floater behave consistently. Fixes permissions exploit introduced on 23 August.
* | Remove spammy debug for IMMelanie2012-10-111-3/+3
| |
* | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IMMelanie2012-09-091-0/+3
| | | | | | | | to UUID.Zero because it ties up XMLRPC handlers needlessly.
* | Merge branch 'master' into careminsterMelanie2012-07-191-8/+11
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Fix regression where llGiveInventory() had stopped asking non-owner ↵Justin Clark-Casey (justincc)2012-07-171-8/+11
| | | | | | | | | | | | | | | | | | receivers to accept/decline. This appears to be a regression from back in commit db91044 (Mon Aug 22 2011) where we started to send TaskInventoryOffered msg dialog rather than InventoryOffered dialog. This is probably correct, but failed because the bucket was too large and because we wouldn't have handled the TaskInventoryDeclined option anyway. This patch handles both of these and make llGiveInventoryList() use TaskInventoryOffered as well Fixes http://opensimulator.org/mantis/view.php?id=6089
* | Add some loggingMelanie2012-01-171-0/+41
| |
* | Merge branch 'master' into careminsterMelanie2012-01-021-2/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout ↵Diva Canto2011-12-291-2/+1
| | | | | | | | region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
* | Fix task inventory givingMelanie2011-12-072-18/+10
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-141-1/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * 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
| * Port the Avination offline messaging system to CoreMelanie2011-11-021-18/+34
| |
* | Fix the offline message module to revert core changes and restore avnMelanie2011-10-281-18/+28
| | | | | | | | specific behavior
* | Merge branch 'master' into bigmergeMelanie2011-10-272-50/+33
|\ \ | |/ | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into bigmergeMelanie2011-10-262-0/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-252-0/+2
| | | | | | | | | | | | | | | | | | 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 '3142982353a121920e571e5b33acffc065b20a2e' into bigmergeMelanie2011-10-121-21/+4
|\ \ | |/
| * Removed redundant scene presence lookups in HGMessageTransferModuleDan Lake2011-10-051-21/+4
| |
* | Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmergeMelanie2011-10-111-5/+6
|\ \ | |/
| * Fix failure to teleport when an agent is lured on the same sim (and probably ↵Justin Clark-Casey (justincc)2011-09-221-5/+6
| | | | | | | | | | | | | | | | | | in neighbouring sims) with HG lure active It turns out that the HG lure module was setting up a pending lure when it intercepted the instant message on its way out to the target avatar. However, an IM would only be sent if the user was remote, so it would not be set up for users on the same sim or in an immediate neighbour. We fix this by adding the pending lure when the message goes out and ignoring a duplicate pending lure add if it goes to out via IM. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5690
* | First set of merge fixesTom2011-09-071-51/+38
| |
* | Resolve merge commits, stage 1Tom2011-09-041-3/+9
|\ \ | |/
| * refactor: Move all callers of the obsoleted ↵Justin Clark-Casey (justincc)2011-07-131-3/+4
| | | | | | | | SychronousRestObjectPoster.BeginPostObject() to the identical SynchronousRestObjectRequester.MakeRequest()
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-0/+350
|\ \ | |/
| * This fixes the crash reported in ↵Diva Canto2011-06-071-3/+5
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully.
| * This should make offline IMs work again. It should work for incoming foreign ↵Diva Canto2011-06-061-1/+4
| | | | | | | | IMs where the local recipient is offline. I can't test any of this, because I don't run an offline IM server.
| * Bug fix on HG IM.Diva Canto2011-06-021-2/+6
| |
| * HG lures working! Friends can offer friends HG teleports via the profile. ↵Diva Canto2011-05-271-1/+0
| | | | | | | | WARNING: additional configuration for HG inis -- see *Common.ini.example
| * HG IM in grid mode working fairly well. Unknown target user references ↵Diva Canto2011-05-261-0/+74
| | | | | | | | looked back in source user's User Agent service.
| * HG: Instant Message working. Tested on HG standalones only. Needs a lot more ↵Diva Canto2011-05-251-0/+268
| | | | | | | | testing.
generated by cgit v1.1 at 2024-09-18 07:55:30 +0000