aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Go back to lying that sim fps is 55 when it's actually locked at a maximum ↵Justin Clark-Casey (justincc)2011-10-081-2/+6
| | | | | | | of 11. We're been lying since 2008 so I'm sure another few years can't hurt. To know the real fps, either divide sim fps by 5 and/or look at the frame time.
* Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log messageJustin Clark-Casey (justincc)2011-10-071-1/+1
| | | | As per earlier discussions with dslake
* Fixed line endings from previous commitDan Lake2011-10-063-51/+51
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-063-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.
* | 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 branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-062-301/+301
|\
| * 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 branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-067-109/+76
| |\ | | | | | | | | | | | | 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
* | | WebStats - Home Link FixPixel Tomsen2011-10-061-2/+3
| |/ |/| | | | | http://opensimulator.org/mantis/view.php?id=4536
* | 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
* | 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
* | 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
* | 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.
* | Remove unused local variable i from OdeScene.Simulate()Justin Clark-Casey (justincc)2011-10-051-3/+0
| |
* | 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.
* 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
|\
| * 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.
* | 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.
* 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
|\
| * trival tweak to trigger the continuous integration systemJustin Clark-Casey (justincc)2011-10-041-1/+1
| |
| * Animation-States Turning Left, Turning Right implemented/enabledPixel Tomsen2011-10-041-2/+6
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3036
| * 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
| * 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
| |\
| * | Remove vestigal RegionStatus.SlaveScene.Justin Clark-Casey (justincc)2011-10-032-60/+49
| | | | | | | | | | | | This appears to be code clutter since the code that uses this has long gone.
* | | 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.
* | Remove usage of Linden packet types from inside Attachments Module and interfaceDan Lake2011-10-033-10/+10
|/
* Remove unimplementated UpdateMovement() methods from SOG, SOP.Justin Clark-Casey (justincc)2011-10-014-17/+1
| | | | | SP still has an implementation but this is now just a public method on SP rather than an abstract one in EntityBase. No point making the code more complex until it actually needs to be,
* Remove OpenSim.Region.Examples.SimpleModuleJustin Clark-Casey (justincc)2011-10-017-1634/+0
| | | | | This module is more than 2 years old and at least some of the 'example' code it gives is now misleading. Even the logs say it say some bits were broken where it was put in!
* llGetLinkKey, llGetLinkName Fix for sitting AvatarPixel Tomsen2011-10-011-0/+41
| | | | | | when an avatar sits on a prim, we get now his key & name ;-) http://opensimulator.org/mantis/view.php?id=4476
* minor: remove clutter null check from pass in config to ↵Justin Clark-Casey (justincc)2011-10-012-8/+14
| | | | | | AvatarFactoryModule.Initialize() This is never null
* Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)2011-09-302-4/+53
| | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled
* llAvatarOnLinkSitTarget ImplementationPixel Tomsen2011-09-293-0/+20
| | | | http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget
* Add en_US culture setting to the async delete to inventory thread, to avoid ↵Justin Clark-Casey (justincc)2011-09-261-0/+5
| | | | | | | | any issues with float serialization with machines set to non en_US locales. Doing this to see if addresses inventory object deserialization problems in http://opensimulator.org/mantis/view.php?id=5708, though if it does I'm really surprised not to have seen it before now. Really need to go through and systematically set the culture for every timer and change all BeginInvoke calls to FireAndForget instead. But don't want to do something like that this close to a release.
* Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ↵Snoopy Pfeffer2011-09-252-2/+11
| | | | are only sent to affected clients.
* Remove the unimplented "clear assets" command.Justin Clark-Casey (justincc)2011-09-241-9/+0
| | | | | This was a bizarre relic of a bygone age that had no implementations. If you're using and want to clear the flotsam asset cache then please use the existing "fcache clear" command
* Added a setting to [Startup] section of config that will allow the simulator ↵Kevin Houlihan & Michelle Argus2011-09-241-3/+6
| | | | | | to start up with no regions configured. I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.
* Don't try and resolve user account for authorization if the agent has come ↵Justin Clark-Casey (justincc)2011-09-241-1/+11
| | | | | | | | | | in via hypergrid. If a user account isn't available, this just passes on the name given by the agent instead. I'm not sure this is particularly useful since I believe that agent names could be faked in this context - it might be no more useful than a viewer agent string. In fact, there might even be an argument that passing on this name provides a false expectation of authenticity. However, I will apply for now. Patch applied from http://opensimulator.org/mantis/view.php?id=5696 Thanks Michelle Argus.
* Improve locking when access queue in EventQueueGetModuleJustin Clark-Casey (justincc)2011-09-241-14/+17
|
* remove unused SOP.Create() methodJustin Clark-Casey (justincc)2011-09-231-14/+0
|
* Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-235-88/+258
| | | | | | | | | When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-221-5/+5
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-219-87/+25
| |\
| * | Commented out new debug statements in ScenePresenceDan Lake2011-09-211-5/+5
| | |
* | | Fix failure to teleport when an agent is lured on the same sim (and probably ↵Justin Clark-Casey (justincc)2011-09-222-9/+18
| |/ |/| | | | | | | | | | | | | | | in neighbouring sims) with HG lure active It turns out that the HG lure module was setting up a pending lure when it intercepted the instant message on its way out to the target avatar. However, an IM would only be sent if the user was remote, so it would not be set up for users on the same sim or in an immediate neighbour. We fix this by adding the pending lure when the message goes out and ignoring a duplicate pending lure add if it goes to out via IM. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5690
* | Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-229-87/+25
|/ | | | This is moved into ScenePresence for now as a general facility