aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-081-1/+1
|\
| * Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-041-2/+2
|\ \ | | | | | | | | | careminster
| * | Correct sit position calculationsMelanie2012-02-231-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-041-1/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * | comment out "[CAPS]: ScriptTaskInventory Request" log spamJustin Clark-Casey (justincc)2012-03-021-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-02-241-2/+5
|\ \ \ | |/ / | | / | |/ |/|
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-2/+5
| | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
* | Properly sequence updates of avatars and attachments so that we don'tMelanie2012-02-231-0/+8
| | | | | | | | | | update attachments on child avatars or intermingle agent and attachment updates, which would render the root prim of huds invisible
* | Show avatars as sitting on proot prims only to avoid motion jitterMelanie2012-02-231-5/+31
| | | | | | | | for passengers
* | Merge branch 'master' into careminsterMelanie2012-02-181-36/+53
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends ↵Justin Clark-Casey (justincc)2012-02-161-3/+3
| | | | | | | | grid call would try and contact the wrong uri. Also fixes the build from df960d5
| * Add known identity informatio nto log message if an exception is thrown ↵Justin Clark-Casey (justincc)2012-02-161-36/+53
| | | | | | | | during LLUDPServer.HandleUseCircuitCode()
* | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-141-1/+2
| | | | | | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet.
* | Merge branch 'master' into careminsterMelanie2012-02-101-0/+12
|\ \ | |/
| * Fix: Covenant view fails after updates or cache-clean see mantis ↵PixelTomsen2012-02-101-0/+12
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2879 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-02-104-14/+21
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * Fix: Unable to remove AV from friend list (sqldb-bug) ↵PixelTomsen2012-02-101-7/+7
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3731
| * When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer ↵Justin Clark-Casey (justincc)2012-02-103-7/+14
| | | | | | | | | | | | | | | | permissions, not PermissionMask.All Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set. This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is). Should resolve http://opensimulator.org/mantis/view.php?id=5651
* | Merge branch 'master' into careminsterMelanie2012-02-041-4/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Fix: Covenant changed time not set ↵PixelTomsen2012-02-031-4/+4
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Replace ParcelAccessEntry with a new struct, LandAccessEntry, which moreMelanie2012-02-021-7/+7
| | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts)
* | Make ban, eject, freeze and the scripted versions of those work.Melanie2012-02-021-7/+7
| |
* | Merge branch 'master' into careminsterMelanie2012-01-311-2/+1
|\ \ | |/
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-01-311-2/+1
| |
* | Fix displaying landmark and search info properly with long namesMelanie2012-01-301-1/+4
| |
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-01-301-1/+1
|\ \ | | | | | | | | | careminster
| * | Prevent an overlong description from messing up a ParcelInfoReplyMelanie2012-01-281-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-291-0/+71
|\ \ \ | |/ / |/| / | |/
| * Fix:Get embedded objects in notecard ↵PixelTomsen2012-01-291-0/+71
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2607 Signed-off-by: nebadon <michael@osgrid.org>
* | Merge branch 'master' into careminsterMelanie2012-01-282-4/+4
|\ \ | |/
| * Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-282-4/+4
| | | | | | | | agent id anyway
* | Merge branch 'master' into careminsterMelanie2012-01-251-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Fix "Abnormal client thread terminations" stat in period CONNECTION ↵Justin Clark-Casey (justincc)2012-01-241-0/+1
| | | | | | | | | | | | STATISTICS to count the number of times clients are disconnected due to ack timeouts. This has been broken for a long period and would only ever show 0.
* | 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
|\ \ | |/