aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-03-0426-311/+951
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-0425-297/+946
| |\
| | * 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
| | * remove a final trace of the old framework.communications.testsJustin Clark-Casey (justincc)2010-03-031-1/+0
| | * 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-037-95/+673
| | |\
| | | * * Added three new helper utility files to OpenSim.Framework. MultipartForm is...John Hurliman2010-03-034-0/+651
| | | * * 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
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-037-75/+41
| | | |\
| | | * | * Fixed bad start position clamping in MakeRootAgent()John Hurliman2010-03-031-33/+7
| | * | | reset the accidental local configuration changesJustin Clark-Casey (justincc)2010-03-032-8/+10
| | * | | Fix bug where approximately half the time, attachments would rez only their r...Justin Clark-Casey (justincc)2010-03-037-43/+145
| | | |/ | | |/|
| | * | Actually make EventManager.OnAttach() fire when an object is attached. Previ...Justin Clark-Casey (justincc)2010-03-031-0/+3
| | * | Make the service loader pump out the error to the log (in red) and include th...Justin Clark-Casey (justincc)2010-03-032-5/+24
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-031-44/+0
| | |\ \
| | | * | Fixed prebuild errors that have emerged with the mergeDiva Canto2010-03-031-44/+0
| | | |/
| | * | remove references to OpenSim.Framework.Commuications.Tests.dll since all rele...Justin Clark-Casey (justincc)2010-03-033-26/+14
| | |/
| | * Added empty service URLs upon account creation.Diva Canto2010-03-031-0/+9
| | * More debug.Diva Canto2010-03-021-0/+1
| | * Better error handling on PasswordAuthenticationServiceDiva Canto2010-03-021-14/+18
| * | Remove a superfluous array creationMelanie2010-03-041-1/+0
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-034-47/+94
|\ \ | |/
| * * Better debug message on login problems.Diva Canto2010-03-024-47/+94
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-03502-46871/+26028
|\ \ | |/
| * Fixes Region.Framework tests. Although these tests don't fail, they need to b...Diva Canto2010-03-022-16/+17
| * Fixed SQL tests.Diva Canto2010-03-021-4/+1
| * Merge branch 'presence-refactor'Melanie2010-03-021-8/+41
| |\
| | * Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open...Diva Canto2010-03-014-38/+52
| | |\
| | * | Offline friendship offers now working.Diva Canto2010-03-011-8/+41
| * | | Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-020-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' into presence-refactorMelanie2010-03-024-38/+52
| | |\ \ | | | |/ | | |/|
| * | | Merge branch 'master' into presence-refactorMelanie2010-03-024-38/+52
| |\ \ \ | | |/ / | |/| / | | |/
| | * Fix a few compiler warnings.Jeff Ames2010-03-013-9/+0
| | * Formatting cleanup.Jeff Ames2010-03-011-33/+18
| * | Changed the query in GetFriends in SQLite to match the one in MySql.Diva Canto2010-03-011-1/+1
| * | Friends rights under control.Diva Canto2010-03-014-72/+41
| * | More work on GrantRights. Still not right.Diva Canto2010-03-013-78/+135
| * | Fix -1 checks for login caseMelanie2010-03-011-1/+1
| * | Small tweakMelanie2010-03-011-1/+1
| * | Merge branch 'master' into presence-refactorMelanie2010-03-018-804/+951
| |\ \ | | |/
| | * fix bug where region settings loaded via an oar (water height, terrain textur...Justin Clark-Casey (justincc)2010-02-261-0/+2
| | * minor formatting tweak - try to trigger a build on pandadahlia2010-02-221-1/+0
| | * add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitivedahlia2010-02-221-0/+35
| | * Minor formatting cleanup.Jeff Ames2010-02-222-36/+35
| | * Separate PhysX classes into separate files.Jeff Ames2010-02-224-770/+882
| * | Should have things the right way around, better that wayMelanie2010-03-011-1/+1
| * | Change friends to handle offers as it was originally designed. This mayMelanie2010-03-014-21/+5