Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Remove the pointless LLClientView.m_imageManager null check. | Justin Clark-Casey (justincc) | 2012-01-04 | 1 | -16/+4 | |
| | | | | | | | | Despite the code comments we never actually null it. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 2 | -14/+21 | |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs | |||||
| * | Reduce accessibility of some J2KImage/LLImageManager properties and methods ↵ | Justin Clark-Casey (justincc) | 2012-01-02 | 2 | -12/+12 | |
| | | | | | | | | to reduce potential code complexity and make code reading easier. | |||||
| * | Adding commented out log messages and some minor formatting for future bug ↵ | Justin Clark-Casey (justincc) | 2012-01-02 | 1 | -1/+8 | |
| | | | | | | | | hunting. No functional changes. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-28 | 1 | -2/+5 | |
|\ \ | |/ | ||||||
| * | HG: more / love for Xmas | Diva Canto | 2011-12-24 | 1 | -2/+5 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 1 | -5/+20 | |
|\ \ | |/ | ||||||
| * | Stop unnecessarily sending the TextureEntry in client avatar updates. | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -1/+7 | |
| | | | | | | | | | | | | As far as I know, viewers don't use this mechanism to recieve new TextureEntry data for avatars. This is done via the AvatarAppearance packet instead. Tested this back to viewer 1.23. Replacing with Utils.EmptyBytes since converting the texture entry to bytes on each AvatarUpdate (or which there are many) is not cost-free. | |||||
| * | Migrate detailed "appearance show" report generation up to ↵ | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -4/+13 | |
| | | | | | | | | | | | | | | | | 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 | 1 | -0/+1 | |
|\ \ | |/ | ||||||
| * | Stop generating client flags when we send out full object updates. | Justin Clark-Casey (justincc) | 2011-12-16 | 1 | -0/+1 | |
| | | | | | | | | These were entirely unused. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-14 | 1 | -2/+4 | |
|\ \ | |/ | ||||||
| * | In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() ↵ | Justin Clark-Casey (justincc) | 2011-12-13 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | in the same thread rather than on another one. The caller is already an async thread from LLClientView so this doesn't hold up the client. However, launching on a separate thread does remove the effect of m_setAppearanceLock This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -0/+12 | |
|\ \ | |/ | ||||||
| * | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 1 | -0/+12 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -12/+4 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||||
| * | Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -12/+4 | |
| | | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-09 | 4 | -240/+278 | |
|\ \ | |/ | ||||||
| * | Don't reply with an ack packet if the client is not authorized. | Justin Clark-Casey (justincc) | 2011-12-08 | 2 | -45/+31 | |
| | | ||||||
| * | Extend TestAddClient() to check that the first packet received is an ack packet | Justin Clark-Casey (justincc) | 2011-12-08 | 3 | -93/+116 | |
| | | ||||||
| * | Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -1/+1 | |
| | | ||||||
| * | Reactivate BasicCircuitTests.TestAddClient() | Justin Clark-Casey (justincc) | 2011-12-08 | 3 | -109/+138 | |
| | | | | | | | | This checks that the initial UseCircuitCode packet is handled correctly for a normal client login. | |||||
| * | Remove unnecessary AgentCircuitData null check from Scene.AddNewClient(). | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -4/+4 | |
| | | | | | | | | | | 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 | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 3 | -21/+46 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | On a new client circuit, send the initial reply ack to let the client know ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 3 | -21/+46 | |
| | | | | | | | | | | | | | | | | | | 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 | |||||
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-12-08 | 2 | -7/+1 | |
|\ \ | ||||||
| * \ | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge | Melanie | 2011-12-08 | 2 | -7/+1 | |
| |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | Stop also adding an ordinary http handler when we set up a poll http handler. | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -6/+0 | |
| | | | | | | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path. | |||||
| | * | Stop accidentally setting up the UploadTexture caps handler with the same ↵ | Justin Clark-Casey (justincc) | 2011-12-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | url for all users This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures. This hopefully resolves the recent UploadTexture LLSD problems This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000) | |||||
* | | | Recover from an internal mess-up in the outgoing packet queues by creating | Melanie | 2011-12-08 | 1 | -19/+36 | |
|/ / | | | | | | | a new queue object. | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -3/+3 | |
|\ \ | |/ | ||||||
| * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | 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. | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 2 | -122/+113 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | refactor: Separate the upload baked texture handler out from BunchOfCaps | Justin Clark-Casey (justincc) | 2011-12-01 | 2 | -122/+113 | |
| | | ||||||
* | | Implement ChangeInventoryItemFlagsPacket handling | Melanie | 2011-12-04 | 1 | -0/+16 | |
| | | ||||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-01 | 2 | -2/+4 | |
|\ \ | |/ | ||||||
| * | On "show caps", stop excluding the seed cap but do exclude it elsewhere | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -1/+2 | |
| | | ||||||
| * | Improve some of the debug help messages | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -0/+1 | |
| | | ||||||
| * | Correct mistake in "debug eq" help | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 4 | -170/+280 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||||
| * | Rip out unused Scene.HandleFetchInventoryDescendentsCAPS(). | Justin Clark-Casey (justincc) | 2011-11-26 | 1 | -1/+0 | |
| | | | | | | | | This has been handled by WebFetchInvDescHandler.Fetch() for some time. | |||||
| * | Use the same web fetch handler for every request from every avatar, since it ↵ | Justin Clark-Casey (justincc) | 2011-11-26 | 1 | -3/+11 | |
| | | | | | | | | contains no instance code | |||||
| * | Fix config so that you can have both WebFetchInventoryDescendents and ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -1/+2 | |
| | | | | | | | | FetchInvnetoryDescendents2 caps active at once | |||||
| * | Resolve error where an unknown asset type would cause the fetch inventory ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -4/+1 | |
| | | | | | | | | | | | | descendents cap to fail. Introduced just a few commits ago in 0688861 | |||||
| * | Implement the FetchInventoryDescendents2 capability using the same code as ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -17/+38 | |
| | | | | | | | | | | | | WebFetchInventoryDescendents. Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers. | |||||
| * | Fix WebFetchInventoryDescendents cap to use ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -0/+2 | |
| | | | | | | | | | | | | Utils.AssetTypeTostring/InventoryTypeToString to convert types to strings These cover a wider range of types. | |||||
| * | When setting packet level logging via "debug packet", apply to all clients, ↵ | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -7/+11 | |
| | | | | | | | | | | | | not just root ones. Also adds scene name and client type (root|child) to logged information. | |||||
| * | comment out a noisy log line I accidentally left in from the last commit | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -1/+1 | |
| | | ||||||
| * | Stop passing a request handler to the initial caps.RegisterHandler in ↵ | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -157/+162 | |
| | | | | | | | | | | | | EventQueueGetModule since this is immediatley replaced by a poll server handler. This allows us to comment out a bunch of code and simplify the codebase and readability. | |||||
| * | Add a "debug eq" console command for debugging. | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -6/+79 | |
| | | | | | | | | This will log outgoing event queue message names if turned on. |