aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmergeMelanie2011-10-111-5/+6
|\
| * Fix failure to teleport when an agent is lured on the same sim (and probably ...Justin Clark-Casey (justincc)2011-09-221-5/+6
* | First set of merge fixesTom2011-09-071-51/+38
* | Resolve merge commits, stage 1Tom2011-09-041-3/+9
|\ \ | |/
| * refactor: Move all callers of the obsoleted SychronousRestObjectPoster.BeginP...Justin Clark-Casey (justincc)2011-07-131-3/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-0/+350
|\ \ | |/
| * This fixes the crash reported in http://opensimulator.org/mantis/view.php?id=...Diva Canto2011-06-071-3/+5
| * This should make offline IMs work again. It should work for incoming foreign ...Diva Canto2011-06-061-1/+4
| * Bug fix on HG IM.Diva Canto2011-06-021-2/+6
| * HG lures working! Friends can offer friends HG teleports via the profile. WAR...Diva Canto2011-05-271-1/+0
| * HG IM in grid mode working fairly well. Unknown target user references looked...Diva Canto2011-05-261-0/+74
| * HG: Instant Message working. Tested on HG standalones only. Needs a lot more ...Diva Canto2011-05-251-0/+268
| * Instrument the heck out of offline messages. THIS IS VERY VERBOSE.Diva Canto2011-05-121-0/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-171-1/+0
|\ \ | |/
| * Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open...Diva Canto2011-04-121-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
|\ \ | |/
| * For now, comment out logging messages about IM sending, since these cause hig...Justin Clark-Casey (justincc)2011-01-191-3/+3
* | 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
|\ \ | |/
| * Fix a broken format on an error message. Also replace yet another e.MessageMelanie2010-12-221-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
| |/
| * * additional serveruri cleanupJonathan Freedman2010-10-031-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
|\ \ | |/
| * Quash the region ID on intersim messages. That prevents people from determiningMelanie2010-09-271-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-261-1/+2
|\ \ | |/
| * When receiving intersim IM, don't let the spoof protection bombMelanie2010-09-261-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-251-1/+2
|\ \ | |/
| * Prevent spoofing the agent name on text IMMelanie2010-09-251-1/+2
| * Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-171-1/+12
* | 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
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-09-121-1/+1
| * * Changed 11 calls for session info to the more optimized API methodJohn Hurliman2010-09-081-3/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-232-3/+2
|\ \ | |/
| * Remove various warnings and improve logging messages. No functional changes.Justin Clark-Casey (justincc)2010-08-232-8/+10
| * Clean up some messiness in IM sending. Having offline IM enabled now no longerMelanie Thielker2010-08-042-6/+10
* | and another one...sacha2010-08-071-1/+1
* | Clean the loo after use please !!!!!sacha2010-08-071-4/+4
* | Clean up some messiness in IM sending. Having offline IM enabled now no longerMelanie Thielker2010-08-042-6/+10
* | Fix IMs the right way. This sets it up so that timestamps are actuallyMelanie Thielker2010-07-032-32/+60