aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage (follow)
Commit message (Collapse)AuthorAgeFilesLines
* commit what i did so far for core mutes module, befere i lose itUbitUmarov2017-12-112-69/+71
|
* move some sharable items out of Xmute to Framework; add another test ↵UbitUmarov2017-11-172-120/+229
| | | | mutelistmodule, ignore it
* Donating the Avination Mute ModuleMelanie Thielker2017-11-141-0/+357
| | | | | | | | This lived out-of-tree and therefore wasn't part of the big code drop. It's classic Avination, tied to MySQL and a direct database connection and I don't have the bandwidth to fix it to core methods. However, it has all the strange mute logic that OpenSim was missing and maybe someone can step up to make it work in an open grid context.
* mantis 8131: make the new Offline IM code optional and disabled by default, ↵UbitUmarov2017-03-301-32/+55
| | | | since it is not compatible with current central servers, like in osgrid.
* Activate the new Offline IM module code instead of the old codeMelanie Thielker2017-01-231-20/+4
| | | | | As most have gone to OfflineMessaging V2, this change will not affect existing users but will benefit future grids.
* Massive tab and trailing space cleanupMelanie Thielker2017-01-055-11/+11
|
* minor change to getdisplaynames cap urlUbitUmarov2016-11-161-42/+2
|
* 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-242-50/+20
|
* Split IM handling so an inheriting module can cange names if required.Melanie Thielker2016-06-211-2/+6
|
* Make chat and instant message modules fully subclassableMelanie Thielker2016-06-141-19/+19
|
* change OfflineMessageModule from new avination code to original master, for ↵UbitUmarov2015-11-061-4/+20
| | | | compatibility with current web servers php scripts. This may change after current test phase
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-082-2/+0
|\ | | | | | | | | | | | | | | 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
| * Deleted OpenSim.Framework.Communications. Moved its two remaining files to ↵Diva Canto2015-09-042-2/+0
| | | | | | | | OpenSim.Framework.
* | seems to compile ( tests comented out)UbitUmarov2015-09-022-73/+92
| |
* | bad merge?UbitUmarov2015-09-013-43/+249
|\ \ | |/ |/|
| * 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
| * | | 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
| * \ \ Merge branch 'master' into careminsterMelanie2012-11-301-14/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-11-135-0/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * \ \ \ \ \ 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
| * | | | | | | 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
| * | | | | | | | 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
| * | | | | | | | | 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
| * | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into bigmergeMelanie2011-10-262-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmergeMelanie2011-10-251-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmergeMelanie2011-10-121-21/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmergeMelanie2011-10-111-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | First set of merge fixesTom2011-09-071-51/+38
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Resolve merge commits, stage 1Tom2011-09-041-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-0/+350
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-171-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | | | | | | | Remove some code that was meant to fool the viewer into thinking SLT. It neverMelanie2010-12-261-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worked and it turned out the issues were really in the backend.
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-231-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-08-24 22:28:56 +0000