aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-224-8/+18
|\
| * rename Scene.m_physicalPrim to PhysicalPrims since its public and access exte...Justin Clark-Casey (justincc)2011-12-222-3/+3
| * Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()Justin Clark-Casey (justincc)2011-12-222-4/+2
| * Make it possible to force all prims to be phantom via the collidable_prim boo...Justin Clark-Casey (justincc)2011-12-222-1/+13
* | Merge branch 'master' into careminsterMelanie2011-12-221-39/+32
|\ \ | |/
| * Region crossings redone: (1) removed WaitForCallback. Now that we are passing...Diva Canto2011-12-221-39/+32
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+1
|\ \ | |/
| * And a typo fixMelanie2011-12-221-1/+1
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+6
|\ \ | |/
| * Add a few comments, correct a merge artefactMelanie2011-12-221-1/+6
| * Harmonizing SP with AvinationMelanie2011-12-221-41/+55
* | Merge branch 'master' into careminsterMelanie2011-12-2213-152/+134
|\ \ | |/
| * Fixing a bug introduced yesterday. This put the precondition test inside Chec...Diva Canto2011-12-221-105/+109
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-2112-39/+15
| |\
| | * Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-2011-35/+14
| * | Moved an external test into the method that uses those preconditions.Diva Canto2011-12-211-19/+11
| * | HG: Verify that the user is localDiva Canto2011-12-211-0/+8
* | | Merge branch 'master' into careminsterMelanie2011-12-204-9/+9
|\ \ \ | | |/ | |/|
| * | Though the viewer warns about receiving this, not sending appears to break ba...Justin Clark-Casey (justincc)2011-12-201-4/+1
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-2021-282/+299
| |\
| * | Fixed bug of avie going under the terrain when crossing regions in certain di...Diva Canto2011-12-201-2/+2
| * | Changed the async approach on close child agents. This may improve crossings ...Diva Canto2011-12-162-7/+7
| * | Commented a couple of verbose debug messages.Diva Canto2011-12-162-2/+2
* | | Merge branch 'master' into careminsterMelanie2011-12-193-36/+44
|\ \ \ | | |/ | |/|
| * | Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs a...Justin Clark-Casey (justincc)2011-12-193-36/+44
* | | Merge branch 'master' into careminsterMelanie2011-12-198-62/+108
|\ \ \ | |/ /
| * | Stop sending the viewer its own AvatarAppearance packet.Justin Clark-Casey (justincc)2011-12-191-1/+4
| * | Stop unnecessarily sending the TextureEntry in client avatar updates.Justin Clark-Casey (justincc)2011-12-191-1/+7
| * | Fix race condition where the appearance update timer could be stopped just af...Justin Clark-Casey (justincc)2011-12-191-3/+6
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-191-1/+1
| |\ \
| | * | addresses mantis #5827nebadon2011-12-191-1/+1
| * | | Migrate detailed "appearance show" report generation up to AvatarFactoryModul...Justin Clark-Casey (justincc)2011-12-197-56/+90
| |/ /
* | | Merge branch 'master' into careminsterMelanie2011-12-1823-292/+297
|\ \ \ | |/ /
| * | Provide user feedback on execution of "backup" region console commandJustin Clark-Casey (justincc)2011-12-171-1/+2
| * | Fix bug where objects couldn't be set back to the "none" group.Justin Clark-Casey (justincc)2011-12-171-8/+13
| * | Fix bug where objects could not be set to a new group if the group had been c...Justin Clark-Casey (justincc)2011-12-178-21/+50
| * | If a startup simulator script is present, run it after the normal region sele...Justin Clark-Casey (justincc)2011-12-171-12/+12
| * | refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim...Justin Clark-Casey (justincc)2011-12-172-142/+81
| * | Stop generating client flags when we send out full object updates.Justin Clark-Casey (justincc)2011-12-164-27/+11
| * | Don't pass on ChaneWaterHeight event from EventManager is new water height is...Justin Clark-Casey (justincc)2011-12-161-0/+6
| * | Comment out accidentally left in "Adding physics prim" log messageJustin Clark-Casey (justincc)2011-12-161-1/+1
| * | Tunnel [GroupsModule] DebugEnabled setting down into XmlRpcGroupsServicesConn...Justin Clark-Casey (justincc)2011-12-162-11/+10
| |/
| * Sends the consistent child agent position upon creation of the child agent in...Diva Canto2011-12-161-1/+12
| * No functional changes. Changed the prefix of that log message [CONNECTION BEG...Diva Canto2011-12-162-15/+15
| * HG minor bug fix and marked one method obsolete in UAS.Diva Canto2011-12-163-1/+6
| * Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter con...Justin Clark-Casey (justincc)2011-12-151-5/+0
| * Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() whe...Justin Clark-Casey (justincc)2011-12-154-24/+27
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-151-1/+1
| |\
| | * minor fix to MegaRegions, typo spotted by Ubit!nebadon2011-12-151-1/+1
| * | Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacterJustin Clark-Casey (justincc)2011-12-153-35/+56
| |/