aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensimdahlia2009-11-208-66/+101
| |\
| * | remove early return from PrimitiveBaseShape.ToOmvPrimitive() when prim is a s...dahlia2009-11-201-2/+0
* | | Merge branch 'careminster' into testsKittoFlora2009-11-1923-546/+911
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2009-11-198-65/+87
| |\ \ \ | | | |/ | | |/|
| | * | minor: tweak log message to say which region is being enabled for loginsJustin Clark-Casey (justincc)2009-11-181-5/+6
| | * | minor: Correct some inventory corrector log messages and add more identifying...Justin Clark-Casey (justincc)2009-11-181-19/+20
| | * | minor: correct error messages when queryfolder failsJustin Clark-Casey (justincc)2009-11-182-7/+2
| | * | minor: remove duplicate copyright notice in PollServiceWorkerThreadJustin Clark-Casey (justincc)2009-11-181-28/+1
| | * | Implement generic delete methodMelanie2009-11-182-2/+16
| | * | Tweak presence handling and whip up a database connector and handlerMelanie2009-11-185-4/+42
| * | | Merge branch 'master' into careminsterMelanie2009-11-1819-482/+825
| |\ \ \ | | |/ /
| | * | Change PresenceData to PresenceInfo to remove a naming conflict in theMelanie2009-11-183-2/+15
| | |/
| | * Correct formatting of Primitive.Textures in PrimitiveBaseShape.ToOmvPrimitive...dahlia2009-11-171-1/+1
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2009-11-172-0/+216
| | |\
| | | * Add the presence server connectorMelanie2009-11-172-0/+216
| | * | refactor: Eliminate redundant CreateSceneViewer call on ScenePresence constru...Justin Clark-Casey (justincc)2009-11-171-4/+1
| | * | Add scene animator set up to apparantly uncalled no-arg ScenePresence constru...Justin Clark-Casey (justincc)2009-11-171-1/+2
| | * | refactor: move AvatarAnimations, BinBVHAnimationJustin Clark-Casey (justincc)2009-11-174-61/+62
| | * | minor: remove mono compiler warning due to unreachable code in GroupsModuleJustin Clark-Casey (justincc)2009-11-171-2/+2
| | * | refactor: move AnimationSetJustin Clark-Casey (justincc)2009-11-172-2/+3
| | * | refactor: move most animation methods from ScenePresence into a new ScenePres...Justin Clark-Casey (justincc)2009-11-177-406/+499
| | |/
| | * minor: very minor formatting changeJustin Clark-Casey (justincc)2009-11-162-6/+1
| | * minor: add forgotton copyright headerJustin Clark-Casey (justincc)2009-11-161-0/+26
* | | Clean up messages in ODEKittoFlora2009-11-192-4/+4
* | | Fix merge conflictsKittoFlora2009-11-162-10/+3
* | | Merge branch 'careminster' into testsKittoFlora2009-11-16167-4152/+5417
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2009-11-151-0/+200
| |\ \ | | |/
| | * Committing the incomplete table handler to get it into the tree. No userMelanie2009-11-151-0/+200
| * | Change land packet sending back to what the careminster release usedMelanie2009-11-151-49/+34
| * | Add the ability to send messages to users ir regions via remote adminMelanie2009-11-151-0/+48
| * | Prevent a nullref if a recipient of a group message gas left the sceneMelanie2009-11-151-12/+15
| * | - Lower TIME_MS_TOLERANCE to 200ms - Allow m_updateFlag to be reset to 0 in t...unknown2009-11-154-15/+49
| |/
| * Make GroupRootUpdate be a terse update. This method is not used by opensim (i...Diva Canto2009-11-141-2/+2
| * undo previous changesdahlia2009-11-134-16/+12
| * expose SceneGraph.GetGroupByPrim(UUID)dahlia2009-11-131-1/+1
| * minor: A further minor tweak to reduce iar load logging verbosityJustin Clark-Casey (justincc)2009-11-131-2/+2
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2009-11-131-3/+3
| * make logging less verbose when loading iarsJustin Clark-Casey (justincc)2009-11-131-1/+1
| * Some corrections to PrimitiveBaseShape.ToOmvPrimitive()dahlia2009-11-131-6/+26
| * Apply patch http://opensimulator.org/mantis/view.php?id=4369Justin Clark-Casey (justincc)2009-11-123-32/+81
| * move fake user service to a separate mock user service classJustin Clark-Casey (justincc)2009-11-122-159/+123
| * refactor: extract another test asset helper methodJustin Clark-Casey (justincc)2009-11-122-4/+16
| * refactor some test asset creation into a helper classJustin Clark-Casey (justincc)2009-11-122-8/+53
| * Rename test services to mock services, since this is a more accurate descriptionJustin Clark-Casey (justincc)2009-11-125-156/+13
| * minor: for now stop iar tests spewing log messages when running testsuiteJustin Clark-Casey (justincc)2009-11-121-1/+1
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2009-11-122-17/+17
| * Stop iar save failing on corrupt assetsJustin Clark-Casey (justincc)2009-11-123-5/+38
| * minor: refactor common setup in uuid gatherer testJustin Clark-Casey (justincc)2009-11-121-3/+10
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2009-11-122-2/+3
| * * Added some new syntax options for the Monitor Module's HTTP poll.Adam Frisby2009-11-121-0/+30