aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminsterMelanie2012-01-221-1/+13
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
| * Telehub Support:BlueWall2012-01-211-1/+13
| | | | | | | | Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
* | Merge branch 'master' into careminsterMelanie2012-01-215-19/+274
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-203-33/+143
| |\
| | * Allow a viewer UDP image request retry to trigger another asset fetch if an ↵Justin Clark-Casey (justincc)2012-01-192-6/+32
| | | | | | | | | | | | | | | | | | existing fetch hasn't responded before a timeout. This is to stop a high priority image/texture request from blocking the entire download queue if its asset fetch got dropped for some reason.
| | * Add image not in database test for LLImageManagerJustin Clark-Casey (justincc)2012-01-193-13/+52
| | |
| | * refactor: separate out common parts of LLImageManagerTestsJustin Clark-Casey (justincc)2012-01-191-48/+40
| | |
| | * Add LLImageManager regression test for discard caseJustin Clark-Casey (justincc)2012-01-191-0/+53
| | |
| * | Telehub Support:BlueWall2012-01-201-3/+36
| |/ | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
| * Add "image queues clear <first-name> <last-name>" console commandJustin Clark-Casey (justincc)2012-01-191-0/+20
| | | | | | | | This allows a way to manually clear pending image queue requests for debug purposes
| * Add basic request and send image regression tests for LLImageManagerJustin Clark-Casey (justincc)2012-01-194-6/+98
| |
* | Fix prim calculations so that > 32767 prims are supportedMelanie2012-01-171-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-161-5/+10
|\ \ | |/
| * Comment out noisy log lines I accidentally included in the nant build target ↵Justin Clark-Casey (justincc)2012-01-161-6/+6
| | | | | | | | | | | | adjustment commit. Left in the method doc.
| * Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-161-5/+10
| | | | | | | | | | monocov was a code coverage attempt 3 years ago which no longer works. other removed targets have been commented out or unused for a very long time
* | Merge branch 'master' into careminsterMelanie2012-01-102-5/+19
|\ \ | |/
| * Add "show image queue <first-name> <last-name>" region console commandJustin Clark-Casey (justincc)2012-01-102-5/+19
| | | | | | | | This is so that we can inspect the image download queue (texture download via udp) for debugging purposes.
* | Merge branch 'master' into careminsterMelanie2012-01-061-0/+151
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
| * Implement the FetchInventory2 capability. This accompanies the existing ↵Justin Clark-Casey (justincc)2012-01-061-0/+151
| | | | | | | | | | | | | | | | | | | | FetchInventoryDescendents2 capability. Not yet enabled by default. You can enable this by setting Cap_FetchInventory2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini Enabling both FetchInventory2 and FetchInventoryDescendents2 improves the situation with properly fetching attachments and hud objects Probably because viewers are never expecting the odd situation where FetchInventoryDescendents2 is present but not FetchInventory2 However, for some reason attachments and hud objects occasionally fail to appear, though their status is correct in inventory For attachments, focussing on the avatar makes them appear. Hud objects have to be reattached.
| * recomment log messages I accidentally left uncommentedJustin Clark-Casey (justincc)2012-01-051-6/+6
| |
| * Improve "app rebake" command to return a better message if no uploaded ↵Justin Clark-Casey (justincc)2012-01-051-6/+6
| | | | | | | | texture ids were available for the rebake request
* | Merge branch 'master' into careminsterMelanie2012-01-053-38/+80
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Minor formatting changes and commented out log lines for future debugging of ↵Justin Clark-Casey (justincc)2012-01-043-22/+76
| | | | | | | | image manager (udp texture fetch). No significant functional changes.
| * Remove the pointless LLClientView.m_imageManager null check.Justin Clark-Casey (justincc)2012-01-041-16/+4
| | | | | | | | Despite the code comments we never actually null it.
* | Merge branch 'master' into careminsterMelanie2012-01-022-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-022-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-021-1/+8
| | | | | | | | hunting. No functional changes.
* | Merge branch 'master' into careminsterMelanie2011-12-281-2/+5
|\ \ | |/
| * HG: more / love for XmasDiva Canto2011-12-241-2/+5
| |
* | Merge branch 'master' into careminsterMelanie2011-12-191-5/+20
|\ \ | |/
| * Stop unnecessarily sending the TextureEntry in client avatar updates.Justin Clark-Casey (justincc)2011-12-191-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-191-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 careminsterMelanie2011-12-181-0/+1
|\ \ | |/
| * Stop generating client flags when we send out full object updates.Justin Clark-Casey (justincc)2011-12-161-0/+1
| | | | | | | | These were entirely unused.
* | Merge branch 'master' into careminsterMelanie2011-12-141-2/+4
|\ \ | |/
| * In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() ↵Justin Clark-Casey (justincc)2011-12-131-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 careminsterMelanie2011-12-101-0/+12
|\ \ | |/
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-101-0/+12
| |
* | Merge branch 'master' into careminsterMelanie2011-12-101-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-091-12/+4
| | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
* | Merge branch 'master' into bigmergeMelanie2011-12-094-240/+278
|\ \ | |/
| * Don't reply with an ack packet if the client is not authorized.Justin Clark-Casey (justincc)2011-12-082-45/+31
| |
| * Extend TestAddClient() to check that the first packet received is an ack packetJustin Clark-Casey (justincc)2011-12-083-93/+116
| |
| * Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suiteJustin Clark-Casey (justincc)2011-12-081-1/+1
| |
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-083-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-081-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 bigmergeMelanie2011-12-083-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-083-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 bigmergeMelanie2011-12-082-7/+1
|\ \
| * \ Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-082-7/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs