| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -117/+112 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Fixing a bug introduced yesterday. This put the precondition test inside ↵ | Diva Canto | 2011-12-22 | 1 | -105/+109 |
| | | | | | | | | | CheckForBorderCrossing the right way. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-21 | 1 | -4/+1 |
| | |\ | |||||
| | * | | Moved an external test into the method that uses those preconditions. | Diva Canto | 2011-12-21 | 1 | -19/+11 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-20 | 1 | -5/+5 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| | * | | Though the viewer warns about receiving this, not sending appears to break ↵ | Justin Clark-Casey (justincc) | 2011-12-20 | 1 | -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. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-20 | 8 | -194/+163 |
| | |\ | |||||
| | * | | Changed the async approach on close child agents. This may improve crossings ↵ | Diva Canto | 2011-12-16 | 2 | -7/+7 |
| | | | | | | | | | | | | | a little bit. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 2 | -6/+44 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs ↵ | Justin Clark-Casey (justincc) | 2011-12-19 | 2 | -6/+44 |
| | | | | | | | | | | | | | as this is updating SOG/SOP.GroupID, which is arguably generic. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 2 | -3/+15 |
| |\ \ \ | |/ / | |||||
| | * | | Stop sending the viewer its own AvatarAppearance packet. | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -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-19 | 2 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 7 | -234/+154 |
| |\ \ \ | |/ / | |||||
| | * | | Fix bug where objects could not be set to a new group if the group had been ↵ | Justin Clark-Casey (justincc) | 2011-12-17 | 4 | -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-17 | 2 | -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-16 | 3 | -27/+10 |
| | | | | | | | | | | | | | These were entirely unused. | ||||
| | * | | Don't pass on ChaneWaterHeight event from EventManager is new water height ↵ | Justin Clark-Casey (justincc) | 2011-12-16 | 1 | -0/+6 |
| | |/ | | | | | | | | | | | | | is less than 0 This is to stop bad values and subsequent viewer crashes. Thanks to Michelle Argus for this patch. | ||||
| | * | No functional changes. Changed the prefix of that log message [CONNECTION ↵ | Diva Canto | 2011-12-16 | 2 | -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-15 | 1 | -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/OdeCharacter | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -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 | ||||
| * | | Fix hit testing link sets properly. Fix raycasting for LSL. | Melanie | 2011-12-17 | 1 | -6/+6 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-14 | 2 | -11/+5 |
| |\ \ | |/ | |||||
| | * | Just adding a comment to SendFullUpdatToClient | Dan Lake | 2011-12-13 | 1 | -0/+2 |
| | | | |||||
| | * | Reorder clearing of upate schedule on SOP to before sending updates. Fix ↵ | Dan Lake | 2011-12-13 | 1 | -11/+3 |
| | | | | | | | | | potential race condition. | ||||
| * | | Comment debug spam | Melanie | 2011-12-13 | 1 | -1/+1 |
| | | | |||||
| * | | Prevent a nasty deadlock on teleport | Melanie | 2011-12-12 | 1 | -24/+22 |
| | | | |||||
| * | | Make m_attachments private | Melanie | 2011-12-12 | 1 | -1/+1 |
| | | | |||||
| * | | Remove spammy log messages when querying sim health | Melanie | 2011-12-12 | 1 | -2/+14 |
| | | | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2011-12-12 | 4 | -47/+55 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2011-12-12 | 4 | -47/+55 |
| | |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | | * | Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵ | Dan Lake | 2011-12-12 | 4 | -46/+55 |
| | | | | | | | | | | | | | IsColliding | ||||
| * | | | Send changed animation event asynchronously | Melanie | 2011-12-12 | 1 | -14/+17 |
| |/ / | |||||
| * | | Fix a regression that causes data from the attachments module to fail loading | Melanie | 2011-12-10 | 1 | -0/+1 |
| | | | |||||
| * | | Prevent spurious error message when client tries to move a null item | Melanie | 2011-12-10 | 2 | -119/+143 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 3 | -53/+40 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | ||||
| | * | Do some clean up Scene.cs log messages. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -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-09 | 3 | -29/+2 |
| | | | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-09 | 2 | -8/+6 |
| |\ \ | |/ | |||||
| | * | remove some unused fields in ScenePresence | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+0 |
| | | | |||||
| | * | Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -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. | ||||
| * | | Restore the Avination way of position and angle calculation so resizers | Melanie | 2011-12-09 | 1 | -5/+2 |
| | | | | | | | | | work again. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-09 | 3 | -15/+6 |
| |\ \ | |/ | |||||
| | * | Remove unnecessary AgentCircuitData null check from Scene.AddNewClient(). | Justin Clark-Casey (justincc) | 2011-12-08 | 2 | -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 warnings | Justin Clark-Casey (justincc) | 2011-12-08 | 2 | -3/+1 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 4 | -70/+62 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | When a client connects to a scene, send other avatar appearance data ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -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-08 | 4 | -48/+30 |
| | | | | | | | | | | | | | | | | | | | 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-08 | 1 | -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. | ||||
| * | | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge | Melanie | 2011-12-08 | 3 | -39/+59 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |