admin/opensim
1
0
Fork 0
mirror of git://opensimulator.org/git/opensim synced 2026-08-15 17:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,199 Commits 112 Branches 81 Tags
BulletSim2017
Commit Graph
54 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 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) 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) 8457044b2f Eliminate subsequently unused scene finding in UndeliveredMessage() method of xmlrpc and core offline IM modules 2014-05-12 22:23:24 +01: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
Kevin Cozens 3fe5e9057f Prevent an exception if no offline messages were retrieved. 2013-06-18 23:15:38 +01: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 d6486fe14a Fix task inventory giving 2011-12-07 00:43:59 +01:00
Melanie 08fcf958c2 Port the Avination offline messaging system to Core 2011-11-02 23:50:47 +00:00
Melanie 175d74e68c Fix the offline message module to revert core changes and restore avn 
specific behavior
 2011-10-28 23:10:54 +02:00
Tom 03f6734f43 First set of merge fixes 2011-09-07 09:42:18 -07:00
Tom 66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc) 08dc07dc76 refactor: Move all callers of the obsoleted SychronousRestObjectPoster.BeginPostObject() to the identical SynchronousRestObjectRequester.MakeRequest() 2011-07-13 00:48:36 +01:00
Diva Canto 301321c853 Instrument the heck out of offline messages. THIS IS VERY VERBOSE. 2011-05-12 19:56:59 -07:00
Melanie 474910c9d6 Merge branch 'master' into careminster-presence-refactor 2011-04-17 18:48:53 +01:00
Diva Canto 7592a033df Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd. 2011-04-12 20:24:28 -07:00
Melanie 385a6c4b34 Convert the scope id in the im session id to a URL variable. Fixes offline 
group notice attachments not working
 2010-11-26 23:20:43 +01:00
Melanie c2971a6398 Add group invites to the list of messages that get offlined 2010-10-10 20:15:02 +02:00
Melanie Thielker edcfaf60c9 Fix IMs the right way. This sets it up so that timestamps are actually 
in PST (to match viewer time), does correct storage and retrieval of
IMs, corrects the session ID and makes sure IMs don't get marked "saved"
if they're live. Removes the group IM save option, which our group IM
module never had in the first place, as saving group chatter makes no
sense at all.
 2010-07-03 20:27:00 +02:00
Melanie Thielker cbca58401a Add the object owner UUID into the binary bucket of object to user IM 2010-06-24 20:46:24 +02:00
Melanie Thielker 2cc1f14b0c Replace the imSessionID, which is useless out of context, with the scope id 
in saved IMs
 2010-06-24 19:37:02 +02:00
Melanie 028a87fe37 Merge branch 'master' into careminster-presence-refactor 
This brings careminster on the level of master. To be tested
 2010-03-03 02:07:03 +00:00
Melanie baaf660511 Merge branch 'master' into presence-refactor 
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
 2010-02-08 15:53:38 +00:00
Melanie a87a247f05 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:21:06 +00:00
Melanie cfca9e1e81 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:20:13 +00:00
Melanie e9c9a74e0a Some merge fixups 2010-01-26 15:12:41 +00:00
Melanie b80ea00265 Merge branch 'master' into careminster 2010-01-26 14:53:14 +00:00
Revolution ec3c31e61e Updates all IRegionModules to the new style region modules. 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-01-23 15:18:52 +00:00
Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor 
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
 2010-01-16 00:05:08 +00:00
Melanie d22bdb5095 Merge branch 'master' into careminster 2010-01-09 12:02:48 +00:00
dahlia 1e899704c1 Adds config option "ForwardOfflineGroupMessages" to allow disabling of group messages forwarded while offline. Addresses Mantis #4457 2010-01-07 11:28:38 -08:00
Melanie eebddcd5e6 Change FriendsModule, InstantMessageModule, MessageTransferModule, MuteListModule, OfflineMessageModule, PresenceModule, InventoryTransferModule and LureModule to new style. Reduce FriendsModule and PresenceModule to shells. 2009-12-28 01:24:15 +00:00
Melanie b7f1fc116e Prevent a nullref if a recipient of a group message gas left the scene 2009-11-15 20:21:46 +00:00
Jeff Ames 840de6c036 Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt. 2009-06-01 06:37:14 +00:00
Melanie Thielker acfb5051cd Intermediate commit. WILL NOT COMPILE! 2009-05-04 20:15:39 +00:00
Melanie Thielker 2a64a1ead4 Remove second timestamp in offline IM, the client already adds one 2009-04-25 19:02:23 +00:00
Melanie Thielker 87ce5ea0eb Actually do what I promised in the previous commit :/ 2009-04-12 12:49:59 +00:00
Melanie Thielker 9d31cfafb2 Funnel stored (offline) IMs through the Scene EventManager to make sure 
they are processed by the modules rather than sent to the client
directly. Allows friends and group requests and responses to be saved, too
 2009-04-12 12:44:41 +00:00
Jeff Ames 54ccca1e2c Update svn properties, add copyright header, formatting cleanup. 2009-03-31 02:00:33 +00:00
Melanie Thielker d857cf1335 Don't let a missing configuration cause a NRE 
Fixes Mantis #3355
 2009-03-29 15:24:50 +00:00