aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Massive tab and trailing space cleanupMelanie Thielker2017-01-051-3/+3
|
* revert adding a new IM parameter ( commit ↵UbitUmarov2016-07-281-6/+0
| | | | | | bf604c85c66dd3bed06e3103cdf210ede02c151f , that was a mistake. this should fix invites accepts etc, that got broken
* add missing IM parameter ( needs fix where it is really relevant )UbitUmarov2016-07-241-2/+5
|
* do not send IMs via child agentsUbitUmarov2016-07-241-28/+17
|
* seems to compile ( tests comented out)UbitUmarov2015-09-021-68/+92
|
* bad merge?UbitUmarov2015-09-011-14/+99
|\
| * Merge branch 'master' into careminsterMelanie2013-07-291-2/+2
| |\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ Merge branch 'master' into careminsterMelanie2012-12-071-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ Merge branch 'master' into careminsterMelanie2012-11-131-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | | | 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 task inventory givingMelanie2011-12-071-17/+8
| | | | | |
| * | | | | Merge branch 'master' into bigmergeMelanie2011-10-271-15/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ Merge branch 'master' into bigmergeMelanie2011-10-261-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * | | | | | | Remove a spammy debugMelanie2011-03-231-2/+2
| | | | | | | |
| * | | | | | | throttle group notices to max of 4 threads at a timeMike Rieker2011-02-201-14/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...otherwise it can create hundreds of threads and hang
| * | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-231-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | Add MessageKey to section Messaging, a key that prevents injection ofMelanie2010-12-301-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IM from external sources
| * | | | | | | | Remove the restriction on communication across scopes. This will allowMelanie2010-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cross-scope users to IM each other.
| * | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-231-2/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-3/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-3/+3
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-3/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-201-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-171-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust
| * | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-231-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Clean the loo after use please !!!!!sacha2010-08-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to keep useless debug message ! Never heard of wasted cpucycle you darn kid !
| * | | | | | | | | | | | | Clean up some messiness in IM sending. Having offline IM enabled now no longerMelanie Thielker2010-08-041-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suppresses "Inventory Saved" messages.
* | | | | | | | | | | | | | Fix possible infinite recursion in ↵Justin Clark-Casey (justincc)2014-05-231-108/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageTransferModule.SendGridInstantMessageViaXMLRPCAsync() whilst preserving retry lookup behaviour. This is based on heavily mikemig's original patch in http://opensimulator.org/mantis/view.php?id=7149 but instead of exiting after the first IM delivery failure to presence information retrieved from the presence service it will retry the lookup until the result matches the previous lookup. This is to deal with the case where the agent is sent an IM whilst they are teleporting.
* | | | | | | | | | | | | | For XmlRpcGroups (Flotsam) module, when MessageOnlineUsersOnly = true, ↵Justin Clark-Casey (justincc)2014-05-121-5/+5
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle notices to offline users directly as known undeliverable messages rather than discarding or attempting delivery. Offline notices can still be controlled with the [Messaging] ForwardOfflineGroupMessages setting. Looks to address more of http://opensimulator.org/mantis/view.php?id=7037 Only for Flotsam now for testing, but if approach works should be possible with core offline notices as well.
* | | | | | | | | | | | | 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.
* | | | | | | | | | | | 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
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-131-0/+2
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | 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
* | | | | | | | | Removed use of 'is' operator and casting to find the root ScenePresence in ↵Dan Lake2011-10-271-33/+19
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | MessageTransfer modules and Groups module.
* | | | | | | | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-251-0/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | | | For now, comment out logging messages about IM sending, since these cause ↵Justin Clark-Casey (justincc)2011-01-191-3/+3
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | high spam for large group messaging
* | | | | | Fix a broken format on an error message. Also replace yet another e.MessageMelanie2010-12-221-2/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | with e.ToString(). e.Message is USELESS, it doesn't tell us what happened where, we should use e.ToSTring() everywhere
* | | | | * additional serveruri cleanupJonathan Freedman2010-10-031-3/+3
| |_|_|/ |/| | |
* | | | Quash the region ID on intersim messages. That prevents people from determiningMelanie2010-09-271-1/+1
| | | | | | | | | | | | | | | | another avatars location
* | | | Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-171-1/+12
| |_|/ |/| | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust
* | | Formatting cleanup.Jeff Ames2010-09-121-1/+1
| | |
* | | * Changed 11 calls for session info to the more optimized API methodJohn Hurliman2010-09-081-3/+1
| |/ |/|
* | Remove various warnings and improve logging messages. No functional changes.Justin Clark-Casey (justincc)2010-08-231-7/+9
| |
generated by cgit v1.1 at 2024-08-25 01:02:41 +0000