OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,238 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

74 Commits (1e3cb827562f580aea60deab640f98078107e8a3)

Author SHA1 Message Date
Melanie Thielker b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov 16a7232f55 revert adding a new IM parameter ( commit bf604c85c6 
, that was a mistake. this should fix invites accepts etc, that got broken
 2016-07-28 08:22:51 +01:00
UbitUmarov bf604c85c6 add missing IM parameter ( needs fix where it is really relevant ) 2016-07-24 15:17:25 +01:00
UbitUmarov 96a5a053ef do not send IMs via child agents 2016-07-24 14:44:40 +01:00
UbitUmarov a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov 371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Justin Clark-Casey (justincc) 72c67c5091 Fix possible infinite recursion in 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.
 2014-05-23 20:14:49 +01:00
Justin Clark-Casey (justincc) 87e2668529 For XmlRpcGroups (Flotsam) module, when MessageOnlineUsersOnly = true, 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.
 2014-05-12 23:38:48 +01:00
Melanie bf283208df Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-07-29 02:08:05 +01:00
Diva Canto 69975763d2 Several major improvements to group (V2) chat. Specifically: handle 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.
 2013-07-27 15:38:56 -07:00
Melanie 2cb824d3fc Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-12-07 03:49:04 +00:00
Justin Clark-Casey (justincc) 1b5f21f761 minor: also comment out the debug log message which reports searching for child agents in simulator scenes for now. 2012-12-04 23:07:26 +00:00
Justin Clark-Casey (justincc) 0d4047e641 minor: Comment out "Delivering IM to..." messages for now. 2012-12-04 23:06:02 +00:00
Melanie 556d70feef Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
 2012-11-13 17:37:39 +00:00
Diva Canto 608444c9f7 Another 21 modules' directives moved out of .addin.xml 2012-11-13 08:27:51 -08:00
Melanie aba078c93f Fix perms when linking an object. Set root part perms to the perms 
of the link set to make the build floater behave consistently.
Fixes permissions exploit introduced on 23 August.
 2012-10-14 17:32:46 +02:00
Melanie 01f498bfb4 Remove spammy debug for IM 2012-10-11 21:10:25 +02:00
Melanie 0556bbefdd Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM 
to UUID.Zero because it ties up XMLRPC handlers needlessly.
 2012-09-09 16:30:01 +02:00
Melanie 36d744e2a5 Merge branch 'master' into careminster 
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
 2012-07-19 09:47:51 +01:00
Justin Clark-Casey (justincc) ecb759c1e5 Fix regression where llGiveInventory() had stopped asking non-owner 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
 2012-07-17 23:31:38 +01:00
Melanie d6486fe14a Fix task inventory giving 2011-12-07 00:43:59 +01:00
Melanie b975cbcbed Merge branch 'master' into bigmerge 
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
 2011-10-27 18:14:38 +01:00
Dan Lake 272bf71279 Removed use of 'is' operator and casting to find the root ScenePresence in MessageTransfer modules and Groups module. 2011-10-27 02:26:37 -07:00
Melanie fd22159d0c Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Framework/Watchdog.cs
 2011-10-26 01:27:24 +01:00
Justin Clark-Casey (justincc) 8a0a78cbcc Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead 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)
 2011-10-25 20:24:21 +01:00
Melanie 3dc9b0ef18 Remove a spammy debug 2011-03-23 00:32:19 +01:00
Mike Rieker 86decb2aa8 throttle group notices to max of 4 threads at a time 
...otherwise it can create hundreds of threads and hang
 2011-02-20 15:57:57 +00:00
Melanie 105deab601 Merge branch 'master' into careminster-presence-refactor 2011-01-23 23:29:25 +00:00
Justin Clark-Casey (justincc) d3dca7d25a For now, comment out logging messages about IM sending, since these cause high spam for large group messaging 2011-01-19 01:50:02 +00:00
Melanie 24a997eb7c Add MessageKey to section Messaging, a key that prevents injection of 
IM from external sources
 2010-12-30 20:57:56 +01:00
Melanie dfc0c8dca6 Remove the restriction on communication across scopes. This will allow 
cross-scope users to IM each other.
 2010-12-29 15:13:10 +01:00
Melanie d06456c8b2 Merge branch 'master' into careminster-presence-refactor 2010-12-23 02:57:45 +00:00
Melanie 990e73d7cb Fix a broken format on an error message. Also replace yet another e.Message 
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
 2010-12-22 17:33:06 +00:00
Melanie 45314c6622 Merge branch 'master' into careminster-presence-refactor 2010-12-06 02:54:51 +00:00
Melanie 7f74dc1b14 Merge branch 'master' into careminster-presence-refactor 2010-10-23 00:21:42 +01:00
Justin Clark-Casey (justincc) fe8d3d5a2b Revert "Merge remote branch 'otakup0pe/mantis5110'" 
This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
 2010-10-22 23:52:07 +01:00
Melanie fc33d569cd Merge branch 'master' into careminster-presence-refactor 2010-10-21 07:33:01 +01:00
Jonathan Freedman 19119d7705 * additional serveruri cleanup 2010-10-20 22:21:41 -04:00
Jonathan Freedman 69acf9c79b * additional serveruri cleanup 2010-10-03 18:03:53 -04:00
Melanie 296cf04ce6 Merge branch 'master' into careminster-presence-refactor 2010-09-27 01:32:06 +01:00
Melanie 84ab4742c8 Quash the region ID on intersim messages. That prevents people from determining 
another avatars location
 2010-09-27 01:31:17 +01:00
root 7762301cea Revert "* Changed 11 calls for session info to the more optimized API method" 
This reverts commit 5dc9ea2f24.
Also makes online indicators and IM more robust
 2010-09-17 01:57:26 +01:00
root 251f2444d0 Revert "* Changed 11 calls for session info to the more optimized API method" 
This reverts commit 5dc9ea2f24.
Also makes online indicators and IM more robust
 2010-09-17 01:50:48 +02:00
Melanie 6a1ce17cdb Merge branch 'master' into careminster-presence-refactor 
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.
 2010-09-13 16:17:38 +01:00
Jeff Ames f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
John Hurliman 5dc9ea2f24 * Changed 11 calls for session info to the more optimized API method 2010-09-08 15:08:49 -07:00
Melanie 1bfec00a88 Merge branch 'master' into careminster-presence-refactor 2010-08-23 23:55:15 +01:00
Justin Clark-Casey (justincc) 74e5fe5aa9 Remove various warnings and improve logging messages. No functional changes. 2010-08-23 22:24:23 +01:00
sacha e69efdd4ce Clean the loo after use please !!!!! 
No need to keep useless debug message !
Never heard of wasted cpucycle you darn kid !
 2010-08-07 13:13:27 +00:00
Melanie Thielker bda83715e4 Clean up some messiness in IM sending. Having offline IM enabled now no longer 
suppresses "Inventory Saved" messages.
 2010-08-04 02:46:30 +01:00