aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-021-13/+20
|\
| * Bug fix in map tiles in standalone: the map has been blank since commit 01ae9...Diva Canto2011-12-301-13/+20
* | Merge branch 'master' into careminsterMelanie2011-12-221-2/+11
|\ \ | |/
| * rename Scene.m_physicalPrim to PhysicalPrims since its public and access exte...Justin Clark-Casey (justincc)2011-12-221-2/+2
| * Make it possible to force all prims to be phantom via the collidable_prim boo...Justin Clark-Casey (justincc)2011-12-221-0/+9
* | Merge branch 'master' into careminsterMelanie2011-12-191-6/+5
|\ \ | |/
| * Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs a...Justin Clark-Casey (justincc)2011-12-191-6/+5
* | Merge branch 'master' into careminsterMelanie2011-12-181-9/+7
|\ \ | |/
| * Fix bug where objects could not be set to a new group if the group had been c...Justin Clark-Casey (justincc)2011-12-171-3/+1
| * No functional changes. Changed the prefix of that log message [CONNECTION BEG...Diva Canto2011-12-161-6/+6
* | Remove spammy log messages when querying sim healthMelanie2011-12-121-2/+14
* | Merge branch 'master' into careminsterMelanie2011-12-121-4/+4
|\ \ | |/
| * Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsCo...Dan Lake2011-12-121-4/+4
* | Merge branch 'master' into careminsterMelanie2011-12-101-35/+38
|\ \ | |/
| * 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-091-11/+0
* | Merge branch 'master' into bigmergeMelanie2011-12-091-11/+4
|\ \ | |/
| * Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-081-11/+4
* | Merge branch 'master' into bigmergeMelanie2011-12-081-34/+35
|\ \ | |/
| * On a new client circuit, send the initial reply ack to let the client know it...Justin Clark-Casey (justincc)2011-12-081-12/+3
| * Simplify Scene.AddNewClient()Justin Clark-Casey (justincc)2011-12-081-17/+28
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-081-30/+31
|\ \ | |/
| * 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-071-3/+3
| * Stop some places where we're trying to reset animations in child agents where...Justin Clark-Casey (justincc)2011-12-021-1/+0
* | Remove some debug code that had snuck inMelanie2011-12-011-8/+8
* | Implement llTransferLindenDollarsMelanie2011-12-011-0/+10
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-281-4/+2
|\ \
| * \ Merge branch 'master' into bigmergeMelanie2011-11-281-4/+2
| |\ \ | | |/
| | * Remove bizarre call to PhysicsScene.Simulate(0) in Scene.GetNearestAllowedPos...Justin Clark-Casey (justincc)2011-11-241-4/+2
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-191-7/+5
|\ \ \ | |/ /
| * | Merge branch 'master' into bigmergeMelanie2011-11-191-7/+5
| |\ \ | | |/
| | * Don't register a region twice on both official registration and maptile regen...Justin Clark-Casey (justincc)2011-11-191-7/+5
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-171-41/+8
|\ \ \ | |/ /
| * | Merge branch 'master' into bigmergeMelanie2011-11-171-41/+8
| |\ \ | | |/
| | * In AddNewClient, iterator over copy of entities rather than copying under rea...Dan Lake2011-11-151-2/+3
| | * Make tracked per scene thread names conform to the majorirty format.Justin Clark-Casey (justincc)2011-11-151-1/+3
| | * Removed unused and mostly commented out SceneCommunicationService methodsJustin Clark-Casey (justincc)2011-11-151-36/+2
| | * remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is n...Justin Clark-Casey (justincc)2011-11-151-2/+0
* | | Force a sim exit when hearbeat isn't restarting successfullyMelanie2011-11-171-0/+4
|/ /
* | Merge branch 'master' into bigmergeMelanie2011-11-141-0/+10
|\ \ | |/
| * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-111-0/+10
* | Merge branch 'master' into bigmergeMelanie2011-11-061-6/+2
|\ \ | |/
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-061-19/+13
* | Merge branch 'master' into bigmergeMelanie2011-11-061-1/+5
|\ \ | |/
| * HUD attachments: Removes some more messages sent to wrong clients.Snoopy Pfeffer2011-11-061-1/+10
* | Fix up with core changesMelanie2011-11-051-1/+0
* | Merge branch 'master' into bigmergeMelanie2011-11-051-3/+0
|\ \ | |/
| * Remove enableprejump config option and associated code as this is nowMelanie2011-11-051-3/+0
* | Merge branch 'master' into bigmergeMelanie2011-11-041-39/+31
|\ \ | |/