aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage (follow)
Commit message (Expand)AuthorAgeFilesLines
* change OfflineMessageModule from new avination code to original master, for ...UbitUmarov2015-11-061-4/+20
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-082-2/+0
|\
| * Deleted OpenSim.Framework.Communications. Moved its two remaining files to Op...Diva Canto2015-09-042-2/+0
* | 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
| |\
| | * Merge branch 'master' into careminsterMelanie2013-07-291-2/+2
| | |\
| * | | Change OfflineMessageModule to support more differentiated return values and ...Melanie Thielker2014-04-061-8/+47
| |/ /
| * | Merge branch 'master' into careminsterMelanie2012-12-071-5/+5
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2012-11-301-14/+18
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-11-135-0/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-121-1/+1
| |\ \ \ \ \ \
| * | | | | | | Fix perms when linking an object. Set root part perms to the permsMelanie2012-10-141-1/+1
| * | | | | | | 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
| * | | | | | | Merge branch 'master' into careminsterMelanie2012-07-191-8/+11
| |\ \ \ \ \ \ \
| * | | | | | | | Add some loggingMelanie2012-01-171-0/+41
| * | | | | | | | Merge branch 'master' into careminsterMelanie2012-01-021-2/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix task inventory givingMelanie2011-12-072-18/+10
| * | | | | | | | | Merge branch 'master' into bigmergeMelanie2011-11-141-1/+2
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix the offline message module to revert core changes and restore avnMelanie2011-10-281-18/+28
| * | | | | | | | | | Merge branch 'master' into bigmergeMelanie2011-10-272-50/+33
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into bigmergeMelanie2011-10-262-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ 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
| * | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | Remove the restriction on communication across scopes. This will allowMelanie2010-12-291-1/+1
| * | | | | | | | | | | | | | | | | | | Remove some code that was meant to fool the viewer into thinking SLT. It neverMelanie2010-12-261-18/+19
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-231-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Convert the scope id in the im session id to a URL variable. Fixes offlineMelanie2010-11-261-10/+2
| * | | | | | | | | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-201-3/+3
| * | | | | | | | | | | | | | | | | | | | | | Add group invites to the list of messages that get offlinedMelanie2010-10-101-0/+1
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-261-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-09-251-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-171-1/+12
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \