aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* refactor: Use SOP.SitTargetAvatar instead of calling a special ↵Justin Clark-Casey (justincc)2011-10-172-10/+9
| | | | GetAvatarOnSitTarget() which returned exactly the same thing
* Implement osNpcSit(). This is still in development so don't trust itJustin Clark-Casey (justincc)2011-10-172-5/+4
| | | | | | | | | Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE) e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE); At the moment, sit only succeeds if the part has a sit target set. NPC immediately sits on the target even if miles away - they do not walk up to it. This method is in development - it may change so please don't trust it yet. Standing will follow shortly since that's kind of important once you're sitting :)
* improve method doc on Scene.OtherRegionUp()Justin Clark-Casey (justincc)2011-10-151-4/+4
| | | | this is really just to trigger panda.
* move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with ↵Justin Clark-Casey (justincc)2011-10-151-3/+2
| | | | the others
* fetch physical_prim switch from [Startup] config from inside scene, as is ↵Justin Clark-Casey (justincc)2011-10-152-38/+17
| | | | done for most other scene config params
* remove now redundant m_physical_prim flag from SOP.ApplyPhysics()Justin Clark-Casey (justincc)2011-10-152-6/+6
|
* Restore [Startup] physical_prim flag which can stop any prims being subject ↵Justin Clark-Casey (justincc)2011-10-151-1/+6
| | | | | | | to physics This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed. Default for this flag is true as previously.
* remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ↵Justin Clark-Casey (justincc)2011-10-151-4/+0
| | | | done immediately afterwards in DoPhysicsPropertyUpdate()
* refactor: Remove redundant code in SOP.UpdatePrimFlags()Justin Clark-Casey (justincc)2011-10-151-27/+21
|
* factor common code out into SOP.RemoveFromPhysics()Justin Clark-Casey (justincc)2011-10-152-7/+18
|
* refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it ↵Justin Clark-Casey (justincc)2011-10-142-3/+3
| | | | sends entity updates (including presence ones), not just prims.
* Expose minimum frame time and update periods for experimentation.Justin Clark-Casey (justincc)2011-10-131-19/+33
| | | | | | | Settings are at bottom of [Startup] in OpenSimDefaults.ini, override in OpenSim.ini to change Defaults are the same as previously. More information to come on opensim-dev shortly. Feel free to tweak but if you do please don't expect any support unless feedback on certain tweaks is explicitly requested.
* refactor: Put the frame update period when temporary objects are cleaned up ↵Justin Clark-Casey (justincc)2011-10-131-4/+4
| | | | in a field, like all the other update periods
* refactor: chain the two scene constructors together to eliminate more copypastaJustin Clark-Casey (justincc)2011-10-131-29/+1
|
* Tie reported FPS correction factor into the minimum frame time rather than ↵Justin Clark-Casey (justincc)2011-10-132-6/+13
| | | | | | setting separately. This makes reported FPS scale as required if min frame time changes
* Move fps stat adjustment factor into field rather than hard-coded.Justin Clark-Casey (justincc)2011-10-131-1/+12
|
* remove some mono compiler warningsJustin Clark-Casey (justincc)2011-10-123-44/+1
|
* Start recording object updates per second statistic (analogue of agent ↵Justin Clark-Casey (justincc)2011-10-112-1/+35
| | | | | | updates per secod) and expose via monitoring module as ObjectUpdatePerSecondMonitor A useful diagnostic to find out how object updates are burdening a scene
* Add other region stats (total frame time, physics fps, etc.) currently ↵Justin Clark-Casey (justincc)2011-10-101-1/+1
| | | | | | | missing from MonitorModule Unlike the other 3 stats mechanisms, monitor data can be queried per individual region, which makes this useful. This doesn't affect an of the existing monitored stats.
* Convert getLastReportedSimFPS() and getLastReportedSimStats() into more ↵Justin Clark-Casey (justincc)2011-10-101-13/+13
| | | | idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter
* refactor: have lsl and ossl interrogate scene.StatsReporter directly rather ↵Justin Clark-Casey (justincc)2011-10-101-13/+0
| | | | | | than going through scene I know this goes against the law of demeter but I don't think it's that useful here and I'd rather get rid of nasty little wrapper methods
* 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-061-9/+2
|\
| * remove the pointless slashes on the end of the (5!) different server stat ↵Justin Clark-Casey (justincc)2011-10-071-9/+2
| | | | | | | | | | | | | | 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-064-88/+78
|/ | | | | | 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.
* Simplified IsInTransit property on ScenePresence and removed InTransit() ↵Dan Lake2011-10-061-11/+10
| | | | which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit().
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-064-60/+57
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * 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
| * 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.
* | 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 branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-032-47/+48
|\
| * Animation-States Turning Left, Turning Right implemented/enabledPixel Tomsen2011-10-041-2/+6
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3036
| * Remove vestigal RegionStatus.SlaveScene.Justin Clark-Casey (justincc)2011-10-031-45/+42
| | | | | | | | 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-031-1/+1
|/ | | | converted back and forth between ScenePresence and IClientAPI. More to be done still.
* 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,
* 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 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-231-2/+5
| | | | | | | | | 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/opensimDan Lake2011-09-214-7/+16
|\
| * Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-224-7/+16
| | | | | | | | This is moved into ScenePresence for now as a general facility
* | Commented out new debug statements in ScenePresenceDan Lake2011-09-211-5/+5
|/
* Move code which handles NPC movement into Scene so that this can also be ↵Justin Clark-Casey (justincc)2011-09-212-0/+202
| | | | | | | | used by Autopilot coming from the client side. I thought that I had implemented this but must have accidentally removed it. Adds a regression test to detect if this happens again. Temporarily disables automatic landing of NPC at a target. Will be fixed presently.
* 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
|\
| * Make debug statements in ScenePresence consistent and add a few moreDan Lake2011-09-201-10/+14
| |
* | When calling osNpcMoveTo(), rotate the avatar in the direction of travel.Justin Clark-Casey (justincc)2011-09-211-2/+21
|/ | | | | | | This stops the npc walking backwards if the target is directly behind. This means that the npc no longer returns to its original rotation once movement has finished. If you want this behaviour, please store and reset the original rotation after movement. This is somewhat to address http://opensimulator.org/mantis/view.php?id=5678