aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* If dragging a script that is no copy from prim inventory into agentMelanie2012-01-061-16/+39
| | | | | inventory, stop it first in scene. If deleting from prims, move to trash rather then making it poof.
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-054-5/+30
|\
| * Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.Dan Lake2012-01-042-0/+25
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-01-035-177/+209
| |\
| | * commented out "Prevented flyoff" log message for now as this becomes ↵Justin Clark-Casey (justincc)2012-01-031-1/+1
| | | | | | | | | | | | | | | | | | problematic with bot testing. Please uncomment if still needed.
| * | Access to these static methods to serialize objects are useful outside of ↵Dan Lake2012-01-031-4/+4
| | | | | | | | | | | | serializer
* | | Small fix to GetWorldPosition to get closer to Avination sit behaviorMelanie2012-01-051-10/+4
| |/ |/|
* | Bug fix in map tiles in standalone: the map has been blank since commit ↵Diva Canto2011-12-301-13/+20
| | | | | | | | | | | | 01ae916bad672722aa62ee712b7b580d6f5f4370 r/17324 (Nov.18, justincc). But the root cause comes from commit 02e54c57c4901167779f07ed3e89fb1d24ffc22a Author: Oren Hurvitz Date: 7/22/2011 This is a nasty situation. The map tile UUID is, in principle, stored authoritatively in RegionSettings. However, it also needs to be stored in the Grid Service because that's how other sims can retrieve it to send it in Map Blocks to non-V3 viewers. So every time the tile image changes, that change needs to propagate to the Grid Service, and this is done via RegisterRegion (ugh!). Interestingly, this problem didn't affect grids because by default AllowRemoteDelete is false, so the prior images aren't being deleted from the asset servers -- but they were not being correctly updated in the map either, the map was stuck with old images.
* | fix the UsesPhysics flag to reference the physics flag rather than the ↵Mic Bowman2011-12-221-1/+1
| | | | | | | | temponrez flag
* | rename Scene.m_physicalPrim to PhysicalPrims since its public and access ↵Justin Clark-Casey (justincc)2011-12-222-3/+3
| | | | | | | | external as a property
* | Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()Justin Clark-Casey (justincc)2011-12-222-4/+2
| |
* | Make it possible to force all prims to be phantom via the collidable_prim ↵Justin Clark-Casey (justincc)2011-12-222-1/+13
| | | | | | | | | | | | | | | | | | boolean setting in the OpenSim.ini config [Startup] section. Naturally, default is true. When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom. This setting is for test purposes. This switch does not affect the collision of avatars with the terrain.
* | And a typo fixMelanie2011-12-221-1/+1
| |
* | Add a few comments, correct a merge artefactMelanie2011-12-221-1/+6
| |
* | Harmonizing SP with AvinationMelanie2011-12-221-41/+55
| |
* | Fixing a bug introduced yesterday. This put the precondition test inside ↵Diva Canto2011-12-221-105/+109
| | | | | | | | CheckForBorderCrossing the right way.
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-211-4/+1
|\ \ | |/
| * Though the viewer warns about receiving this, not sending appears to break ↵Justin Clark-Casey (justincc)2011-12-201-4/+1
| | | | | | | | | | | | | | | | | | | | baked texture caching when crossing region boundaries. Needs further investigation. Revert "Stop sending the viewer its own AvatarAppearance packet." This reverts commit 92039f295d7fe66bf1a09b29483f9057e395839e.
* | Moved an external test into the method that uses those preconditions.Diva Canto2011-12-211-19/+11
|/
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-207-193/+153
|\
| * Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs ↵Justin Clark-Casey (justincc)2011-12-192-6/+44
| | | | | | | | as this is updating SOG/SOP.GroupID, which is arguably generic.
| * Stop sending the viewer its own AvatarAppearance packet.Justin Clark-Casey (justincc)2011-12-191-1/+4
| | | | | | | | | | The viewer warns in the log if it receives this. Stopping this doesn't appear to have adverse effects on viewer 1 or viewer 3 - the viewer gets its own appearance from body parts/clothes and self-baked textures.
| * Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-191-1/+1
| | | | | | | | | | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages.
| * Fix bug where objects could not be set to a new group if the group had been ↵Justin Clark-Casey (justincc)2011-12-174-17/+8
| | | | | | | | | | | | | | | | | | | | created in that client session, or if no other action has been performed on the object. There were two problems here: 1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session 2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag. This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588 This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
| * refactor: simplify methods in Scene.PacketHandlers.cs by using ↵Justin Clark-Casey (justincc)2011-12-172-142/+81
| | | | | | | | GetGroupByPrim() rather than retrieving GetEntities() and inspecting the entire list
| * Stop generating client flags when we send out full object updates.Justin Clark-Casey (justincc)2011-12-163-27/+10
| | | | | | | | These were entirely unused.
| * Don't pass on ChaneWaterHeight event from EventManager is new water height ↵Justin Clark-Casey (justincc)2011-12-161-0/+6
| | | | | | | | | | | | | | is less than 0 This is to stop bad values and subsequent viewer crashes. Thanks to Michelle Argus for this patch.
* | Changed the async approach on close child agents. This may improve crossings ↵Diva Canto2011-12-162-7/+7
|/ | | | a little bit.
* No functional changes. Changed the prefix of that log message [CONNECTION ↵Diva Canto2011-12-162-15/+15
| | | | | | BEGIN] to [SCENE] because that's where the message happens. Also changed the instantiation of a vector object to be done only once instead of every time we receive a position update.
* Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() ↵Justin Clark-Casey (justincc)2011-12-151-6/+2
| | | | | | when we've already passed size information to the avatar at PhysicsScene.AddAvatar() Eliminate some copypasta for height setting in OdeCharacter
* Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacterJustin Clark-Casey (justincc)2011-12-151-27/+32
| | | | | | Stop hiding RemoveAvatar failure, add log messages when characters are removed through defects or re-added unexpectedly. Add commented out log lines for future use. Use automatic property for PhysicsActor for better code readability and simplicity
* Just adding a comment to SendFullUpdatToClientDan Lake2011-12-131-0/+2
|
* Reorder clearing of upate schedule on SOP to before sending updates. Fix ↵Dan Lake2011-12-131-11/+3
| | | | potential race condition.
* Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵Dan Lake2011-12-124-46/+55
| | | | IsColliding
* Do some clean up Scene.cs log messages.Justin Clark-Casey (justincc)2011-12-091-24/+38
| | | | | This prints out both exception message and stacktrace (Exception.ToString()) isn't enough on Windows. This also uses m_log.*Format() which is more efficient than string concat.
* Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵Justin Clark-Casey (justincc)2011-12-093-29/+2
| | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
* remove some unused fields in ScenePresenceJustin Clark-Casey (justincc)2011-12-091-4/+0
|
* Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that ↵Justin Clark-Casey (justincc)2011-12-091-4/+6
| | | | | | it doesn't trigger an exception if the item hasn't been found. In this situation we will now put out a slightly more meaningful log error message instead.
* Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-082-12/+5
| | | | | The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists. This allows us to eliminate another null check elsewhere and simplifies the method contract
* minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-12-082-3/+1
|
* When a client connects to a scene, send other avatar appearance data ↵Justin Clark-Casey (justincc)2011-12-081-6/+6
| | | | | | asynchronously to reduce hold up in the IN UDP packet processing loop. This is already being done for the initial object data send.
* On a new client circuit, send the initial reply ack to let the client know ↵Justin Clark-Casey (justincc)2011-12-083-27/+29
| | | | | | | | | it's live before sending other data. This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before. This may stop some avatars appearing grey on login. This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
* Simplify Scene.AddNewClient()Justin Clark-Casey (justincc)2011-12-081-17/+28
| | | | | If sp becomes null right after we've checked or created it, then behaviour down the line is going to be wrong anyway. So instead retain the check/create ScenePresence reference and use this.
* Remove unused SceneManager.TryGetAvatarsScene()Justin Clark-Casey (justincc)2011-12-071-20/+0
| | | | | It makes far more sense anyway to use TryGetRootScenePresence().Scene, in common with the rest of the code This method could also return any scene for child or root agents, depending in which order the scenes happened to lie in the list
* On an Exception in Scene.RemoveClient(), always remove the client (and SP) ↵Justin Clark-Casey (justincc)2011-12-071-19/+28
| | | | structure so that logout on unexpired packets isn't retriggered, causing the same exception
* Implement XMLRPCAdmin command admin_teleport_agent.Justin Clark-Casey (justincc)2011-12-073-3/+42
| | | | This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-051-40/+42
|\
| * Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-40/+42
| |
* | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-051-1/+1
|/ | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* Split up test SceneHelpers to provide an AddChildScenePresence() callJustin Clark-Casey (justincc)2011-12-031-0/+1
|