aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-063-13/+6
| |\
* | \ Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmergeMelanie2011-10-125-89/+79
|\ \ \ | |/ /
| * | Refactored "known child region" in ScenePresence. There were 4 differentDan Lake2011-10-065-89/+79
| | | | | | | | | | | | | | | | | | ways to access the list/dictionary of child regions and locking was inconsistent. There are now public properties which enforce locks. Callers are no longer required to create new copies of lists.
* | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-123-13/+6
|\ \ \ | | |/ | |/|
| * | remove the pointless slashes on the end of the (5!) different server stat ↵Justin Clark-Casey (justincc)2011-10-073-13/+6
| |/ | | | | | | | | | | | | retrieval mechanisms. Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/ Can't do this with webstats yet since it does insane things to the path.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-062-301/+301
| |\
* | \ Merge commit '95910f03d454e678a04ae7e800a445ba609b6003' into bigmergeMelanie2011-10-121-2/+3
|\ \ \ | |/ /
| * | WebStats - Home Link FixPixel Tomsen2011-10-061-2/+3
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=4536
* | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmergeMelanie2011-10-122-17/+16
|\ \ \ | | |/ | |/|
| * | Simplified IsInTransit property on ScenePresence and removed InTransit() ↵Dan Lake2011-10-062-17/+16
| | | | | | | | | | | | which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit().
* | | Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmergeMelanie2011-10-121-3/+0
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-067-109/+76
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | | HACK: Remove advanced property resending until it is fixed properly in core.Melanie2011-10-121-10/+14
| | |
* | | Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmergeMelanie2011-10-122-265/+266
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Refactor ScenePresence so gets and sets are through properties. Added ↵Dan Lake2011-10-061-287/+288
| | | | | | | | | | | | private sets when needed. Removed redundant code when methods replicated what the set already does
* | | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmergeMelanie2011-10-124-36/+21
|\ \ \ | | |/ | |/|
| * | Instead of adding stat agentMS in all kinds of places, calculate it instead ↵Justin Clark-Casey (justincc)2011-10-064-36/+21
| | | | | | | | | | | | | | | | | | | | | | | | in the main Scene.Update() loop, like the other stats Some of the places where agentMS was added were in separate threads launched by the update loop. I don't believe this is correct, since such threads are no longer contributing to frame time. Some of the places were also driven by client input rather than the scene loop. I don't believe it's appropriate to add this kind of stuff to scene loop stats. These changes hopefully have the nice affect of making the broken out frame stats actually add up to the total frame time
* | | Merge commit '7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7' into bigmergeMelanie2011-10-121-11/+11
|\ \ \ | |/ /
| * | rename WebStatsModules.m_scene to m_scenes since it's a list of scenes, not ↵Justin Clark-Casey (justincc)2011-10-051-11/+11
| | | | | | | | | | | | a single one
* | | Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | |/ /
| * | Add user ID to new estate user prompt, to make it clearer and consistent ↵Justin Clark-Casey (justincc)2011-10-051-1/+1
| | | | | | | | | | | | with the main create user prompts
* | | Merge commit '604708fc969b92af4f07d4acae9f3d15c7cee63e' into bigmergeMelanie2011-10-121-34/+7
|\ \ \ | |/ /
| * | Change WebStatsModule to check its config properly, instead of catching the ↵Justin Clark-Casey (justincc)2011-10-051-34/+7
| | | | | | | | | | | | | | | | | | ineviable NullReferenceException! Also, tidy up spacing.
* | | Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmergeMelanie2011-10-121-3/+0
|\ \ \ | |/ /
| * | Remove unused local variable i from OdeScene.Simulate()Justin Clark-Casey (justincc)2011-10-051-3/+0
| | |
* | | 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
| |/ | | | | | | Also remove some unused fields and improve naming on others.
* | Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmergeMelanie2011-10-121-21/+4
|\ \ | |/
| * Removed redundant scene presence lookups in HGMessageTransferModuleDan Lake2011-10-051-21/+4
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-041-1/+10
| |\
* | \ Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmergeMelanie2011-10-121-7/+5
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
| * | Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree ↵Dan Lake2011-10-041-14/+2
| | | | | | | | | | | | objects already triggers objectkill packet to client. No need to send again.
* | | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-121-1/+10
|\ \ \ | | |/ | |/|
| * | When creating a new user on the comand line, give the option of allowing a ↵Justin Clark-Casey (justincc)2011-10-041-1/+10
| |/ | | | | | | | | | | UUID to be specified to override the randomly generated one. This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership.
* | Fix rezzing coalesced object broken by core mergeMelanie2011-10-121-54/+36
| |
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-1260-9679/+1476
|\ \
| * \ Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmergeMelanie2011-10-124-427/+409
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
| | * Removed all refs to IClientAPI from IAttachmentsModule. Separated client ↵Dan Lake2011-10-044-384/+385
| | | | | | | | | | | | handlers for attachments to call public interface and rearranged module file into sections
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-034-65/+73
| | |\
| * | \ Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmergeMelanie2011-10-116-135/+86
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | Removed redundant code in AttachmentsModule and simplified interfaces which ↵Dan Lake2011-10-036-131/+83
| | | | | | | | | | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still.
| * | | Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmergeMelanie2011-10-111-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | trival tweak to trigger the continuous integration systemJustin Clark-Casey (justincc)2011-10-041-1/+1
| | | |
| * | | Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmergeMelanie2011-10-111-3/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| | * | Animation-States Turning Left, Turning Right implemented/enabledPixel Tomsen2011-10-041-2/+6
| | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=3036
| * | | Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmergeMelanie2011-10-111-1/+1
| |\ \ \ | | |/ /
| | * | Return NULL_KEY from llGetTexture if a non-existent face is indicated, ↵Justin Clark-Casey (justincc)2011-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | rather than "" As per http://wiki.secondlife.com/wiki/LlGetTexture
| * | | Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmergeMelanie2011-10-111-1/+16
| |\ \ \ | | |/ /
| | * | For llGetTexture(), if the face texture asset is in the inventory, return ↵Justin Clark-Casey (justincc)2011-10-041-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the inventory name rather than the asset UUID This is as per http://wiki.secondlife.com/wiki/LlGetTexture Applied patch in http://opensimulator.org/mantis/view.php?id=4552 with an additional break statement if an inventory item is found to exit early. Thanks Michelle Argus!
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-033-10/+10
| | |\ \ | | | |/
generated by cgit v1.1 at 2024-12-23 19:00:23 +0000