aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-10-261-1/+1
|\
* \ Merge branch 'master' into bigmergeMelanie2011-10-263-11/+7
|\ \ | |/
| * Get rid of the pointless null checks on collision listeners. Add warning abo...Justin Clark-Casey (justincc)2011-10-252-7/+0
| * For ScenePresence collision events, instead of creating a new CollisionEvents...Justin Clark-Casey (justincc)2011-10-251-4/+6
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-251-0/+1
* | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmergeMelanie2011-10-251-1/+3
|\ \ | |/
| * Add new EventQueueTests with basic test to check that adding a client registe...Justin Clark-Casey (justincc)2011-10-241-1/+3
* | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * Comment out the uuid gatherer lines that I accidentally left in.Justin Clark-Casey (justincc)2011-10-231-4/+4
* | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmergeMelanie2011-10-252-16/+48
|\ \ | |/
| * Get UUIDGatherer to scan notecards in the graph for asset uuids.Justin Clark-Casey (justincc)2011-10-222-16/+48
* | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmergeMelanie2011-10-251-2/+8
|\ \ | |/
| * Get OdeScene to use passed in time step rather than hard-coded 0.089Justin Clark-Casey (justincc)2011-10-201-2/+8
* | Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmergeMelanie2011-10-251-12/+4
|\ \ | |/
| * Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless Ma...Justin Clark-Casey (justincc)2011-10-201-12/+4
* | Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmergeMelanie2011-10-251-5/+0
|\ \ | |/
| * Removed redundant NotInTransit function from ScenePresence. IsInTransit=false...Dan Lake2011-10-191-5/+0
* | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmergeMelanie2011-10-253-50/+50
|\ \ | |/
| * Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line e...Dan Lake2011-10-193-50/+50
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-10-191-5/+9
| |\
* | \ Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-253-7/+10
|\ \ \ | |/ /
| * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ...Dan Lake2011-10-193-7/+10
* | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmergeMelanie2011-10-251-5/+9
|\ \ \ | | |/ | |/|
| * | Extend scripts stop/start/suspend/resume console commands to allow action on ...Justin Clark-Casey (justincc)2011-10-191-5/+9
| |/
* | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmergeMelanie2011-10-251-2/+3
|\ \ | |/
| * Allow an avatar to be explicitly named to the "debug packet" commandJustin Clark-Casey (justincc)2011-10-171-2/+3
* | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter w...Justin Clark-Casey (justincc)2011-10-171-1/+1
* | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmergeMelanie2011-10-252-12/+13
|\ \ | |/
| * refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSit...Justin Clark-Casey (justincc)2011-10-172-10/+9
* | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmergeMelanie2011-10-251-0/+8
|\ \ | |/
| * Implement osNpcStand(<npc-id>)Justin Clark-Casey (justincc)2011-10-171-0/+8
* | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmergeMelanie2011-10-254-15/+12
|\ \ | |/
| * Implement osNpcSit(). This is still in development so don't trust itJustin Clark-Casey (justincc)2011-10-173-5/+13
* | Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * improve method doc on Scene.OtherRegionUp()Justin Clark-Casey (justincc)2011-10-151-4/+4
* | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmergeMelanie2011-10-251-3/+2
|\ \ | |/
| * move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t...Justin Clark-Casey (justincc)2011-10-151-3/+2
* | MergeMelanie2011-10-252-3/+1
* | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmergeMelanie2011-10-252-35/+18
|\ \ | |/
| * fetch physical_prim switch from [Startup] config from inside scene, as is don...Justin Clark-Casey (justincc)2011-10-152-38/+17
* | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmergeMelanie2011-10-252-6/+6
|\ \ | |/
| * remove now redundant m_physical_prim flag from SOP.ApplyPhysics()Justin Clark-Casey (justincc)2011-10-152-6/+6
* | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmergeMelanie2011-10-251-1/+6
|\ \ | |/
| * Restore [Startup] physical_prim flag which can stop any prims being subject t...Justin Clark-Casey (justincc)2011-10-151-1/+6
* | Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmergeMelanie2011-10-251-4/+0
|\ \ | |/
| * remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ...Justin Clark-Casey (justincc)2011-10-151-4/+0
* | Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmergeMelanie2011-10-251-27/+21
|\ \ | |/
| * refactor: Remove redundant code in SOP.UpdatePrimFlags()Justin Clark-Casey (justincc)2011-10-151-27/+21
* | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmergeMelanie2011-10-252-7/+18
|\ \ | |/
generated by cgit v1.1 at 2024-08-22 19:11:40 +0000