aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-142-11/+5
|\
| * Just adding a comment to SendFullUpdatToClientDan Lake2011-12-131-0/+2
| * Reorder clearing of upate schedule on SOP to before sending updates. Fix pote...Dan Lake2011-12-131-11/+3
* | Comment debug spamMelanie2011-12-131-1/+1
* | Prevent a nasty deadlock on teleportMelanie2011-12-121-24/+22
* | Make m_attachments privateMelanie2011-12-121-1/+1
* | Remove spammy log messages when querying sim healthMelanie2011-12-121-2/+14
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-124-47/+55
|\ \
| * \ Merge branch 'master' into careminsterMelanie2011-12-124-47/+55
| |\ \ | | |/
| | * Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsCo...Dan Lake2011-12-124-46/+55
* | | Send changed animation event asynchronouslyMelanie2011-12-121-14/+17
|/ /
* | Fix a regression that causes data from the attachments module to fail loadingMelanie2011-12-101-0/+1
* | Prevent spurious error message when client tries to move a null itemMelanie2011-12-102-119/+143
* | Merge branch 'master' into careminsterMelanie2011-12-103-53/+40
|\ \ | |/
| * Do some clean up Scene.cs log messages.Justin Clark-Casey (justincc)2011-12-091-24/+38
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ...Justin Clark-Casey (justincc)2011-12-093-29/+2
* | Merge branch 'master' into careminsterMelanie2011-12-092-8/+6
|\ \ | |/
| * remove some unused fields in ScenePresenceJustin Clark-Casey (justincc)2011-12-091-4/+0
| * Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that i...Justin Clark-Casey (justincc)2011-12-091-4/+6
* | Restore the Avination way of position and angle calculation so resizersMelanie2011-12-091-5/+2
* | Merge branch 'master' into bigmergeMelanie2011-12-093-15/+6
|\ \ | |/
| * Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-082-12/+5
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-12-082-3/+1
* | Merge branch 'master' into bigmergeMelanie2011-12-083-49/+61
|\ \ | |/
| * When a client connects to a scene, send other avatar appearance data asynchro...Justin Clark-Casey (justincc)2011-12-081-6/+6
| * On a new client circuit, send the initial reply ack to let the client know it...Justin Clark-Casey (justincc)2011-12-083-27/+29
| * Simplify Scene.AddNewClient()Justin Clark-Casey (justincc)2011-12-081-17/+28
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-083-39/+59
|\ \ | |/
| * Remove unused SceneManager.TryGetAvatarsScene()Justin Clark-Casey (justincc)2011-12-071-20/+0
| * On an Exception in Scene.RemoveClient(), always remove the client (and SP) st...Justin Clark-Casey (justincc)2011-12-071-19/+28
| * Implement XMLRPCAdmin command admin_teleport_agent.Justin Clark-Casey (justincc)2011-12-073-3/+42
* | Fix phantom and temp flags not takingMelanie2011-12-062-2/+10
* | Merge branch 'master' into bigmergeMelanie2011-12-051-1/+1
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-051-40/+42
| |\
| | * Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-40/+42
| * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ...Justin Clark-Casey (justincc)2011-12-051-1/+1
| |/
* | Serialize the Volume Detect fieldMelanie2011-12-052-3/+9
* | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int...Melanie2011-12-051-39/+40
|\ \
| * | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-39/+40
* | | Merge branch 'master' into bigmergeMelanie2011-12-055-145/+236
|\ \ \ | |/ / |/| / | |/
| * Split up test SceneHelpers to provide an AddChildScenePresence() callJustin Clark-Casey (justincc)2011-12-031-0/+1
| * Remove T012_TestAddNeighbourRegion() and T013_TestRemoveNeighbourRegion() sin...Justin Clark-Casey (justincc)2011-12-031-70/+5
| * Extend TestCreateChildScenePresence to make assertions both at CreateAgent st...Justin Clark-Casey (justincc)2011-12-031-0/+16
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-031-11/+46
| * Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionar...Justin Clark-Casey (justincc)2011-12-031-4/+2
| * Add agent circuit number checks to TestCloseAgent()Justin Clark-Casey (justincc)2011-12-031-0/+4
| * Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7Justin Clark-Casey (justincc)2011-12-031-7/+5
| * Workaround for mesh to correct the number of faces in GetNumberOfSides(). Mes...marc2011-12-031-1/+9
| * Update SP.PhysicsCollisionUpdate() doc.Justin Clark-Casey (justincc)2011-12-031-2/+5
| * Add method doc to SP.PhysicsCollisionUpdate() to make it clear that it's call...Justin Clark-Casey (justincc)2011-12-031-0/+4