aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-302-15/+26
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-281-1/+1
| |\
| | * Update the money framework to allow sending the new style linden "serverside ...Melanie2013-05-251-1/+1
| * | First change in Vivox for ages! -- added a lock to serialize calls to vivox s...Diva Canto2013-05-281-14/+25
| |/
* | Merge branch 'master' into careminsterMelanie2013-04-251-2/+4
|\ \ | |/
| * Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if ...Justin Clark-Casey (justincc)2013-04-231-2/+4
* | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-291-1/+1
|\ \ | |/
| * Stop attempts to update/add existing attachments in user inventory when telep...Justin Clark-Casey (justincc)2013-03-281-1/+1
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+1
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+1
* | Merge branch 'master' into careminsterMelanie2013-03-221-10/+7
|\ \ | |/
| * Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 2...Justin Clark-Casey (justincc)2013-03-201-10/+7
| * Multiattach, part 1Melanie2013-03-181-1/+1
* | Merge branch 'avination' into careminsterMelanie2013-03-061-1/+1
|\ \
| * | Multiattach, part 1Melanie2013-03-051-1/+1
| * | Revert "Output some additional data on Vivox connection errors", this logs pa...Melanie2013-02-241-1/+1
| * | Output some additional data on Vivox connection errorsMelanie2013-02-241-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-03-051-1/+1
|\ \ \ | | |/ | |/|
| * | Fixed typos in TempAttachmentsModule. No changes.Diva Canto2013-03-021-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-02-273-32/+47
|\ \ \ | |/ /
| * | Make sure we dispose of WebResponse, StreamReader and Stream in various place...Justin Clark-Casey (justincc)2013-02-273-32/+47
* | | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ \ | |/ /
| * | minor: Change summary in "show appearance" console command to "incomplete" ra...Justin Clark-Casey (justincc)2013-02-211-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-01-234-273/+305
|\ \ \ | |/ /
| * | IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in Open...PixelTomsen2013-01-194-273/+305
* | | Merge branch 'master' into careminsterMelanie2013-01-191-19/+4
|\ \ \ | |/ /
| * | Add "debug set set animations true|false" region console command.Justin Clark-Casey (justincc)2013-01-181-19/+4
* | | Merge branch 'master' into careminsterMelanie2013-01-111-1/+1
|\ \ \ | |/ /
| * | minor: Capitalize GroupsModule command categoryJustin Clark-Casey (justincc)2013-01-101-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-01-042-0/+216
|\ \ \ | |/ /
| * | Fix indenting on ConsoleDisplayTable, align indenting on "show animations" co...Justin Clark-Casey (justincc)2013-01-021-1/+1
| * | minor: Allow objects to be added directly to a row on a ConsoleDisplayTable r...Justin Clark-Casey (justincc)2013-01-021-1/+1
| * | Add "show animations" console command for debug purposes.Justin Clark-Casey (justincc)2013-01-022-0/+216
* | | Merge branch 'avination' into careminsterMelanie2012-11-251-2/+2
|\ \ \ | | |/ | |/|
| * | Remove a superfluous newline from helpMelanie2012-11-231-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-11-253-67/+77
|\ \ \ | |/ / |/| / | |/
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which automati...Justin Clark-Casey (justincc)2012-11-241-1/+1
| * Fix bug where loading an OAR with a deeded parcel would always set the parcel...Justin Clark-Casey (justincc)2012-11-242-66/+76
* | Merge branch 'master' into careminsterMelanie2012-11-153-0/+6
|\ \ | |/
| * All optional modules' directives moved out of addin.xmlDiva Canto2012-11-133-0/+6
* | Merge branch 'master' into careminsterMelanie2012-11-134-4/+4
|\ \ | |/
| * Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-124-4/+4
* | Merge branch 'master' into careminsterMelanie2012-11-124-4/+4
|\ \ | |/
| * Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-124-4/+4
* | Merge branch 'master' into careminsterMelanie2012-10-261-2/+3
|\ \ | |/
| * Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-251-2/+3
* | Merge branch 'master' into careminsterMelanie2012-10-203-8/+107
|\ \ | |/
| * Relocate temporary debug message for sending group IMs to online members only...Justin Clark-Casey (justincc)2012-10-201-4/+12
| * Add experimental [Groups] MessageOnlineUsersOnly option for Flotsam XmlRpc gr...Justin Clark-Casey (justincc)2012-10-201-7/+69
| * Fix build break from commit e469879Justin Clark-Casey (justincc)2012-10-201-1/+1