aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-03-0938-53/+347
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-099-12/+13
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-099-7/+111
| | |\
| | * | * Typo fixesJohn Hurliman2010-03-099-12/+13
| * | | - parcel blocking, region crossing blocking, teleport blockingunknown2010-03-0912-11/+333
| | |/ | |/|
| * | MSSQL tweaks for latest ROBUST - friends handling fixed, GridUserData placeho...unknown2010-03-097-3/+101
| * | Comment a debug message that is a tad too spammyMelanie2010-03-081-1/+1
| * | Add config option for switching between CSJ2K and BuggyJPEG.Melanie2010-03-081-3/+9
| |/
| * * Added code to support either CSJ2K or OpenJPEG texture decoding. Currently ...John Hurliman2010-03-071-20/+33
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-0713-6/+109
| |\
| | * Bug fix: correct name of methods in user accounts connector.Diva Canto2010-03-071-1/+1
| | * Small consistency changeMelanie2010-03-071-2/+2
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-066-13/+58
| | |\
| | * | - supporting llTextBoxunknown2010-03-0612-3/+106
| * | | * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit syst...John Hurliman2010-03-071-0/+28
| | |/ | |/|
| * | Bug fix: store correct position information upon logout. Fixes mantis #4608Diva Canto2010-03-066-13/+58
| |/
* | - parcel blocking, region crossing blocking, teleport blockingunknown2010-03-0912-10/+333
* | Revert "Adds Land Banning."Melanie2010-03-092-120/+58
* | Revert "Adds land ejection and freezing. Adds more checks to land banning."Melanie2010-03-091-103/+25
* | Small consistency changeMelanie2010-03-071-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-0630-427/+1256
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-0626-405/+1137
| |\
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-03-053-20/+28
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-0514-240/+885
| | | |\
| | | * | * Cache packed throttle data to avoid repeated allocations in CheckForSignifi...John Hurliman2010-03-052-15/+25
| | | * | * Fixed an order of operations bug in CheckForSignificantMovement() that was ...John Hurliman2010-03-051-5/+3
| | * | | Justin, I must have been dyslexic when I wrote UserGridService as the name fo...Diva Canto2010-03-057-48/+48
| | | |/ | | |/|
| | * | refactor: Move DetachSingleAttachmentToInv to region moduleJustin Clark-Casey (justincc)2010-03-066-78/+82
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-051-1/+1
| | |\ \ | | | |/
| | | * Bug fix on user account creation -- ServiceURLs field now properly filled out.Diva Canto2010-03-041-1/+1
| | * | refactor: move another AttachObject methodJustin Clark-Casey (justincc)2010-03-052-45/+46
| | * | refactor: move user inventory side of RezSingleAttachment to moduleJustin Clark-Casey (justincc)2010-03-053-29/+43
| | * | refactor: begin to move attachments code into a region moduleJustin Clark-Casey (justincc)2010-03-056-102/+205
| | * | add initial UserGrid service classes as per diva's directionJustin Clark-Casey (justincc)2010-03-058-2/+525
| | |/
| | * Fix LocalPresenceServiceConnector test now that the hardcoded test data has b...Justin Clark-Casey (justincc)2010-03-056-24/+31
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-051-1/+0
| | |\
| | * | minor: comment out a forgotton debug log lineJustin Clark-Casey (justincc)2010-03-041-1/+1
| | * | remove test presence from NullPresenceData since this appears to stop existin...Justin Clark-Casey (justincc)2010-03-043-14/+72
| | * | move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules...Justin Clark-Casey (justincc)2010-03-045-109/+123
| * | | - implementing server 1.38 functionsunknown2010-03-065-10/+119
| | |/ | |/|
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-0423-241/+945
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-0422-227/+940
| |\ \ | | |/
| | * compiler warnings revealed that public PlaySoundSlavePrims properties were ch...Justin Clark-Casey (justincc)2010-03-032-4/+4
| | * minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-03-031-7/+7
| | * refactor: push sog.SendPartFullUpdate() down into sop where it better belongsJustin Clark-Casey (justincc)2010-03-032-45/+43
| | * minor: remove a couple of compiler warningsJustin Clark-Casey (justincc)2010-03-032-15/+5
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-036-95/+672
| | |\
| | | * * Added three new helper utility files to OpenSim.Framework. MultipartForm is...John Hurliman2010-03-033-0/+650
| | | * * Adjusted the significant movement magic value from 0.5m to 2.0m and added a...John Hurliman2010-03-031-1/+6
| | | * Removing the sLLVector3 dinosaurJohn Hurliman2010-03-033-61/+9