aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-251-2/+0
* | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmergeMelanie2011-10-251-2/+10
|\ \ | |/
| * fetch physical_prim switch from [Startup] config from inside scene, as is don...Justin Clark-Casey (justincc)2011-10-151-4/+9
* | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmergeMelanie2011-10-251-2/+1
|\ \ | |/
| * factor common code out into SOP.RemoveFromPhysics()Justin Clark-Casey (justincc)2011-10-151-2/+1
* | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmergeMelanie2011-10-251-19/+33
|\ \ | |/
| * Expose minimum frame time and update periods for experimentation.Justin Clark-Casey (justincc)2011-10-131-19/+33
* | Merge commit '128d8dfd8b355f84a71e2093e942937ca720c5c6' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * refactor: Put the frame update period when temporary objects are cleaned up i...Justin Clark-Casey (justincc)2011-10-131-4/+4
* | Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmergeMelanie2011-10-251-29/+1
|\ \ | |/
| * refactor: chain the two scene constructors together to eliminate more copypastaJustin Clark-Casey (justincc)2011-10-131-29/+1
* | Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmergeMelanie2011-10-251-3/+4
|\ \ | |/
| * Tie reported FPS correction factor into the minimum frame time rather than se...Justin Clark-Casey (justincc)2011-10-131-3/+4
* | Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmergeMelanie2011-10-251-1/+0
|\ \ | |/
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-10-121-36/+0
* | Fake an AgentCircuitData if none is available rather than crashing outMelanie2011-10-241-2/+24
* | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmergeMelanie2011-10-121-13/+0
|\ \ | |/
| * refactor: have lsl and ossl interrogate scene.StatsReporter directly rather t...Justin Clark-Casey (justincc)2011-10-101-13/+0
* | Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmergeMelanie2011-10-121-2/+2
|\ \ | |/
| * Fixed line endings from previous commitDan Lake2011-10-061-2/+2
* | Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmergeMelanie2011-10-121-13/+6
|\ \ | |/
| * Refactored "known child region" in ScenePresence. There were 4 differentDan Lake2011-10-061-13/+6
* | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmergeMelanie2011-10-121-1/+12
|\ \ | |/
| * Instead of adding stat agentMS in all kinds of places, calculate it instead i...Justin Clark-Casey (justincc)2011-10-061-1/+12
* | Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmergeMelanie2011-10-121-8/+18
|\ \ | |/
| * Make reported sim fps more accurate, in line with frame time msJustin Clark-Casey (justincc)2011-10-051-8/+18
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-031-45/+42
| |\
* | \ Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmergeMelanie2011-10-111-3/+1
|\ \ \ | |/ /
| * | Removed redundant code in AttachmentsModule and simplified interfaces which c...Dan Lake2011-10-031-1/+1
* | | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmergeMelanie2011-10-111-40/+44
|\ \ \ | | |/ | |/|
| * | Remove vestigal RegionStatus.SlaveScene.Justin Clark-Casey (justincc)2011-10-031-45/+42
| |/
* | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-111-3/+3
|\ \ | |/
| * Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-221-3/+3
* | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmergeMelanie2011-10-111-1/+67
|\ \ | |/
| * Move code which handles NPC movement into Scene so that this can also be used...Justin Clark-Casey (justincc)2011-09-211-0/+67
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-111-82/+0
|\ \ | |/
| * Correctly create a freshly created estate owner's default items and avatar en...Justin Clark-Casey (justincc)2011-09-161-82/+0
* | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmergeMelanie2011-10-111-0/+1
|\ \ | |/
| * Write code to create minimum necessary body parts/clothing and avatar entries...Justin Clark-Casey (justincc)2011-09-151-0/+1
* | Bring us up to date.Tom2011-09-141-14/+51
|\ \ | |/
| * Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID ...Justin Clark-Casey (justincc)2011-09-131-8/+10
| * In an object return message, send a null-terminated empty string in binary bu...Justin Clark-Casey (justincc)2011-09-131-1/+3
| * stop the redundant passing in of RegionInfo to SceneGraph, since the Scene is...Justin Clark-Casey (justincc)2011-09-121-1/+1
| * Save the default terrain texture UUIDs for a new region instead of leaving th...Justin Clark-Casey (justincc)2011-09-091-1/+36
* | Merge fixes, and fix the buildTom2011-09-141-34/+53
* | First set of merge fixesTom2011-09-071-35/+0
generated by cgit v1.1 at 2024-09-28 21:24:18 +0000