aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-053-3/+3
|\ \
| * \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-053-3/+3
| |\ \
| | * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-053-3/+3
| * | | Try to fix uploaded mesh rotations - code from Avination code base.Melanie2013-02-051-12/+27
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-041-32/+51
|\ \ \ | |/ /
| * | Adds the ability to load more then one IClientNetworkServer thereby allowing ...teravus2013-02-031-32/+51
* | | 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
| * | Merge branch 'ubitwork' into avinationMelanie2013-01-161-2/+8
| |\ \
| | * \ Merge branch 'avination' into ubitworkUbitUmarov2013-01-161-2/+12
| | |\ \
| | * | | try to patch getmesh Throttle (test)UbitUmarov2013-01-131-2/+8
| * | | | Change all uses of the removed state queue to the task queue for now.Melanie2013-01-161-5/+5
| * | | | Complete removal of the now unused state queueMelanie2013-01-162-14/+3
| | |/ / | |/| |
| * | | add some sanity checking to HandleAgentRequestSit handlerdahlia2013-01-131-2/+12
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-01-162-19/+8
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-01-161-12/+3
| |\ \
| * | | Complete removal of the now unused state queueMelanie2013-01-162-15/+4
* | | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-161-12/+3
|\ \ \ \ | | |/ / | |/| |
| * | | move resit fix to ScenePresence.cs and allow for requesting sit on objects ot...dahlia2013-01-141-12/+3
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-01-131-2/+12
|\ \ \ | |/ /
| * | add some sanity checking to HandleAgentRequestSit handlerdahlia2013-01-101-2/+12
* | | Merge branch 'master' into careminsterMelanie2013-01-101-1/+0
|\ \ \ | |/ /
| * | Add the new UpdateAgentInformation cap to make maturity on more recent viewersMelanie2013-01-081-2/+20
* | | Merge branch 'avination' into careminsterMelanie2013-01-103-20/+314
|\ \ \ | | |/ | |/|
| * | Add the new UpdateAgentInformation cap to make maturity on more recent viewersMelanie2013-01-081-0/+19
| * | * Fixed a bug that replayed old cached appearance when changing outfitsteravus2012-12-312-46/+111
| * | * This finishes the implementation of AgentCachedTexture. Requires the XBak...teravus2012-12-292-20/+230
* | | Merge branch 'avination' into careminsterMelanie2013-01-061-27/+60
|\ \ \ | |/ /
| * | * Partial Commit for Avatar Appearance to include the functionality of Cached...teravus2012-12-211-5/+21
| * | Merge branch 'avination' of careminster:/var/git/careminster into teravusworkteravus2012-12-193-12/+57
| |\ \
| * | | * This is a better way to do the last commit.teravus2012-12-081-30/+33
| * | | * Should promote faster self appearance.teravus2012-12-071-19/+33