aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmergeMelanie2011-10-123-51/+51
|\ \ | |/
| * Fixed line endings from previous commitDan Lake2011-10-063-51/+51
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-061-9/+2
| |\
* | \ Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmergeMelanie2011-10-124-88/+78
|\ \ \ | |/ /
| * | Refactored "known child region" in ScenePresence. There were 4 differentDan Lake2011-10-064-88/+78
* | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-121-9/+2
|\ \ \ | | |/ | |/|
| * | remove the pointless slashes on the end of the (5!) different server stat ret...Justin Clark-Casey (justincc)2011-10-071-9/+2
| |/
* | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmergeMelanie2011-10-121-11/+10
|\ \ | |/
| * Simplified IsInTransit property on ScenePresence and removed InTransit() whic...Dan Lake2011-10-061-11/+10
* | Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmergeMelanie2011-10-121-3/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-064-60/+57
| |\
* | \ Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmergeMelanie2011-10-121-255/+266
|\ \ \ | |/ /
| * | Refactor ScenePresence so gets and sets are through properties. Added private...Dan Lake2011-10-061-287/+288
* | | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmergeMelanie2011-10-124-36/+21
|\ \ \ | | |/ | |/|
| * | Instead of adding stat agentMS in all kinds of places, calculate it instead i...Justin Clark-Casey (justincc)2011-10-064-36/+21
* | | Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmergeMelanie2011-10-123-24/+36
|\ \ \ | |/ /
| * | Make reported sim fps more accurate, in line with frame time msJustin Clark-Casey (justincc)2011-10-053-24/+36
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-032-47/+48
| |\
* | \ Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-1211-226/+425
|\ \ \
| * \ \ 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 'b98442dceccd416a493f19153f5daad2e173183e' into bigmergeMelanie2011-10-111-3/+13
| |\ \ \ | | | |/ | | |/|
| | * | Animation-States Turning Left, Turning Right implemented/enabledPixel Tomsen2011-10-041-2/+6
| * | | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmergeMelanie2011-10-111-40/+44
| |\ \ \ | | |/ /
| | * | Remove vestigal RegionStatus.SlaveScene.Justin Clark-Casey (justincc)2011-10-031-45/+42
| | |/
| * | Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmergeMelanie2011-10-114-17/+1
| |\ \ | | |/
| | * Remove unimplementated UpdateMovement() methods from SOG, SOP.Justin Clark-Casey (justincc)2011-10-014-17/+1
| * | Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmergeMelanie2011-10-111-0/+5
| |\ \ | | |/
| | * Add en_US culture setting to the async delete to inventory thread, to avoid a...Justin Clark-Casey (justincc)2011-09-261-0/+5
| * | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmergeMelanie2011-10-112-1/+14
| |\ \ | | |/
| | * Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ar...Snoopy Pfeffer2011-09-252-2/+11
| * | Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmergeMelanie2011-10-111-14/+0
| |\ \ | | |/
| | * remove unused SOP.Create() methodJustin Clark-Casey (justincc)2011-09-231-14/+0
| * | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-111-2/+5
| |\ \ | | |/
| | * Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-231-2/+5
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-214-7/+16
| | |\
| * | \ Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmergeMelanie2011-10-111-5/+5
| |\ \ \ | | |/ /
| | * | Commented out new debug statements in ScenePresenceDan Lake2011-09-211-5/+5
| * | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-114-7/+16
| |\ \ \ | | | |/ | | |/|
| | * | Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-224-7/+16
| | |/
| * | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmergeMelanie2011-10-112-1/+202
| |\ \ | | |/
| | * Move code which handles NPC movement into Scene so that this can also be used...Justin Clark-Casey (justincc)2011-09-212-0/+202
| * | Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmergeMelanie2011-10-111-8/+0
| |\ \ | | |/
| | * Remove unused and never set SP.PreviousRotationJustin Clark-Casey (justincc)2011-09-211-8/+0
| | * get rid of an incredibly noisy logging message from the last commitJustin Clark-Casey (justincc)2011-09-211-1/+1
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-211-10/+14
| | |\
| * | \ Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmergeMelanie2011-10-111-1/+16
| |\ \ \ | | |/ /
| | * | When calling osNpcMoveTo(), rotate the avatar in the direction of travel.Justin Clark-Casey (justincc)2011-09-211-2/+21
| * | | Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmergeMelanie2011-10-111-9/+13
| |\ \ \ | | | |/ | | |/|
| | * | Make debug statements in ScenePresence consistent and add a few moreDan Lake2011-09-201-10/+14
| | |/
generated by cgit v1.1 at 2024-11-16 20:00:45 +0000