aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-151-19/+32
|\
| * Fix server statistics always reporting zero for total network bytes in/out.Robert Adams2013-03-151-19/+32
* | Merge branch 'master' into careminsterMelanie2013-03-132-2/+4
|\ \ | |/
| * minor: Remove mono compiler warning in LLClientViewJustin Clark-Casey (justincc)2013-03-131-1/+1
| * minor: Remove mono compiler warnings in EventQueueTestsJustin Clark-Casey (justincc)2013-03-111-1/+3
* | Merge branch 'master' into careminsterMelanie2013-03-081-1/+1
|\ \ | |/
| * * Just another one of those new packet blocks causing a null ref. Defaultin...teravus2013-03-071-1/+1
* | Merge branch 'master' into careminsterMelanie2013-03-052-7/+9
|\ \ | |/
| * * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9teravus2013-03-041-2/+4
| * Fix issue in the mesh upload flag module where the ID of the last agent to re...Justin Clark-Casey (justincc)2013-03-041-6/+6
* | Merge branch 'avination' into careminsterMelanie2013-03-034-5/+23
|\ \
| * | Make a viewer sent XML error prettierMelanie2013-03-031-0/+4
| * | Make banking no longer break sit rotations. Fix spinning avatars.Melanie2013-02-251-3/+6
| * | The viewer tries to parse the error message body to LLSD - give it some.Melanie2013-02-241-2/+2
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-0/+3
| * | Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
* | | Merge branch 'master' into careminsterMelanie2013-02-225-7/+20
|\ \ \ | | |/ | |/|
| * | Add a method to IStatsCollector for returning stats as an OSDMap.Robert Adams2013-02-201-0/+5
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-192-2/+2
| * | minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linde...Justin Clark-Casey (justincc)2013-02-202-5/+5
| * | Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
| * | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-141-4/+21
| * | Make the sim features module register it's interface so it can be usedMelanie2013-02-131-0/+2
| * | Plumb the path from the client to the extra physics params and backMelanie2013-02-073-4/+83
| * | Send the new physics params to the viewer build dialogMelanie2013-02-071-0/+35
| * | * the root prim was being given an OffsetPosition in addition to setting the ...teravus2013-02-051-1/+1
* | | Merge branch 'avination' into careminsterMelanie2013-02-141-4/+21
|\ \ \ | | |/ | |/|
| * | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-141-4/+21
* | | Merge branch 'avination' into careminsterMelanie2013-02-141-0/+2
|\ \ \ | |/ /
| * | Small fix to sim features moduleMelanie2013-02-141-0/+2
| * | Revert "Push updates from keyframe directly to the front of the output queue ...Melanie2013-02-121-20/+0
| * | Revert "Use actual time dilation for unqueued updates"Melanie2013-02-121-1/+1
| * | Use actual time dilation for unqueued updatesMelanie2013-02-121-1/+1
| * | Push updates from keyframe directly to the front of the output queue ratherMelanie2013-02-121-0/+20
* | | Merge branch 'avination' into careminsterMelanie2013-02-072-115/+70
|\ \ \ | |/ /
| * | Rename Bounciness to RestitutionMelanie2013-02-072-2/+2
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-062-115/+70
| * | * Adds a satisfying angular roll when an avatar is flying and turning. (Gene...Melanie2013-01-311-2/+3
* | | Rename Bounciness to RestitutionMelanie2013-02-072-2/+2
* | | Merge branch 'master' into careminsterMelanie2013-02-052-2/+2
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-052-2/+2
| |\ \
| | * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-052-2/+2
| * | | Try to fix uploaded mesh rotations - code from Avination code base.Melanie2013-02-051-12/+27
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-01-311-2/+3
|\ \ \ | |/ /
| * | * Adds a satisfying angular roll when an avatar is flying and turning. (Gene...teravus2013-01-301-1/+1
* | | Merge branch 'avination' into careminsterMelanie2013-01-271-3/+18
|\ \ \ | | |/ | |/|
| * | * Handle a NRE with Baked Textures that may result in a failed appearance. ...teravus2013-01-221-3/+18
* | | Merge branch 'avination'Melanie2013-01-194-43/+66
|\ \ \ | |/ /
| * | Remove group IM test code also mentioning "OpenSimulator Testing"Melanie2013-01-191-26/+1
| * | Add a way to put things at the front of the queue for any throttle group.Melanie2013-01-163-15/+57