ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-20 23:35:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,977 Commits 5 Branches 93 Tags
720a69a49bf02208ea2763a043056aba00a676e5
Commit Graph

172 Commits

Author SHA1 Message Date
UbitUmarov
efed73b2c3 mantis 8131: make the new Offline IM code optional and disabled by default, since it is not compatible with current central servers, like in osgrid. 2017-03-30 16:27:14 +01:00
Melanie Thielker
1e0ed50d29 Activate the new Offline IM module code instead of the old code 
As most have gone to OfflineMessaging V2, this change will not affect
existing users but will benefit future grids.
 2017-01-23 01:19:28 +00:00
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov
8dd9601fdc minor change to getdisplaynames cap url 2016-11-16 00:42:08 +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
Melanie Thielker
9de8cefee5 Split IM handling so an inheriting module can cange names if required. 2016-06-21 01:20:21 +02:00
Melanie Thielker
141205532b Make chat and instant message modules fully subclassable 2016-06-14 00:03:40 +02:00
UbitUmarov
527ea37540 change OfflineMessageModule from new avination code to original master, for compatibility with current web servers php scripts. This may change after current test phase 2015-11-06 05:18:54 +00:00
Robert Adams
e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905. 
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
 2015-09-08 04:54:16 -07:00
Diva Canto
d00f73c3a4 Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework. 2015-09-04 14:39:23 -07: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)
ec8d21c434 Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis. 
"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.
 2014-11-25 23:23:10 +00:00
Melanie Thielker
159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2014-06-21 00:39:55 +02: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)
8ad29fc5c8 Make offline IM delivery to URL (pre recent Addons code) have a 10 second rather than infinite timeout. 
This both signals a problem with the URL and eventually frees the thread, rather than hanging indefinitely with no information.
 2014-05-12 23:42:47 +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
Justin Clark-Casey (justincc)
8457044b2f Eliminate subsequently unused scene finding in UndeliveredMessage() method of xmlrpc and core offline IM modules 2014-05-12 22:23:24 +01:00
Oren Hurvitz
998d7009a6 Eliminated many warnings 2014-04-23 16:37:36 +03:00
Melanie Thielker
bb841ea9ce Change OfflineMessageModule to support more differentiated return values and allow support for mobile devices and other non-viewer logins 2014-04-06 23:22:37 +02:00
Justin Clark-Casey (justincc)
f49d513089 Change warns associated with UserAgentServiceConnector to debugs, as this is not necessarily a problen with the source simulator (e.g. someone else's remote simulator cannot be contacted). 
This is Oren Hurvitz's second patch from http://opensimulator.org/mantis/view.php?id=6956 with a small amount of correction
 2014-02-14 00:08:13 +00:00
Justin Clark-Casey (justincc)
fc35b45e21 If calls to UserAgentServiceConnector fail then throw an exception. This lets the caller decide whether to discard the error or not. 
This is Oren Hurvitz's 0001 patch from http://opensimulator.org/mantis/view.php?id=6956 but I ended up doing some tweaking to resolve patch application issues.
 2014-02-14 00:01:12 +00: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
Kevin Cozens
3fe5e9057f Prevent an exception if no offline messages were retrieved. 2013-06-18 23:15:38 +01: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
Diva Canto
583e44103c Bug fix in OfflineMessageModule. Mantis #6446 2012-12-04 08:36:54 -08:00
Melanie
daa1d99513 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
	OpenSim/Region/Physics/Meshing/Meshmerizer.cs
 2012-11-30 01:19:08 +00:00
Diva Canto
92a766e8cb Bug fix in Offline IM for inventory transfers. The items were being placed twice in the receiver's inventory. 2012-11-27 21:10:58 -08: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
9a5679876e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
 2012-11-13 02:10:09 +00:00
Diva Canto
86903f23dd Cleanup on region modules: gave short node id's to all of them. 2012-11-12 18:08:02 -08:00
Melanie
2e0ce70e63 Merge branch 'master' into careminster 
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
 2012-11-12 23:27:47 +00:00
Melanie
0d15a6a01f Remove any mention of IRegionModule from region names and comments to aid 
grepping for remaining uses
 2012-11-12 19:18:20 +00: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
08b6b3bb48 Add some logging 2012-01-17 17:36:26 +01:00
Melanie
a6e305063e Merge branch 'master' into careminster 
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
 2012-01-02 21:41:36 +00:00
Diva Canto
571efeddb2 Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account. 2011-12-29 16:12:06 -08:00
Melanie
d6486fe14a Fix task inventory giving 2011-12-07 00:43:59 +01:00
Melanie
afca742392 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
 2011-11-14 20:03:47 +00:00
Justin Clark-Casey (justincc)
49ec85ae15 Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to 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
 2011-11-14 15:24:02 +00:00