Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implement region crossing of sitting avatars. Edit mode and llSetPos work | Melanie | 2012-02-14 | 1 | -1/+2 |
| | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet. | ||||
* | Merge branch 'master' into careminster | Melanie | 2012-02-10 | 1 | -0/+12 |
|\ | |||||
| * | Fix: Covenant view fails after updates or cache-clean see mantis ↵ | PixelTomsen | 2012-02-10 | 1 | -0/+12 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2879 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-10 | 4 | -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) ↵ | PixelTomsen | 2012-02-10 | 1 | -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-10 | 3 | -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 careminster | Melanie | 2012-02-04 | 1 | -4/+4 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 1 | -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 more | Melanie | 2012-02-02 | 1 | -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. | Melanie | 2012-02-02 | 1 | -7/+7 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-31 | 1 | -2/+1 |
|\ \ | |/ | |||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -2/+1 |
| | | |||||
* | | Fix displaying landmark and search info properly with long names | Melanie | 2012-01-30 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-01-30 | 1 | -1/+1 |
|\ \ | | | | | | | | | | careminster | ||||
| * | | Prevent an overlong description from messing up a ParcelInfoReply | Melanie | 2012-01-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-29 | 1 | -0/+71 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Fix:Get embedded objects in notecard ↵ | PixelTomsen | 2012-01-29 | 1 | -0/+71 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2607 Signed-off-by: nebadon <michael@osgrid.org> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 2 | -4/+4 |
|\ \ | |/ | |||||
| * | Remove IClientAPI from the money module. It was only used to pass in the | Melanie | 2012-01-28 | 2 | -4/+4 |
| | | | | | | | | agent id anyway | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | Fix "Abnormal client thread terminations" stat in period CONNECTION ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -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 careminster | Melanie | 2012-01-22 | 1 | -1/+13 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs | ||||
| * | Telehub Support: | BlueWall | 2012-01-21 | 1 | -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 careminster | Melanie | 2012-01-21 | 5 | -19/+274 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-20 | 3 | -33/+143 |
| |\ | |||||
| | * | Allow a viewer UDP image request retry to trigger another asset fetch if an ↵ | Justin Clark-Casey (justincc) | 2012-01-19 | 2 | -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 LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 3 | -13/+52 |
| | | | |||||
| | * | refactor: separate out common parts of LLImageManagerTests | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -48/+40 |
| | | | |||||
| | * | Add LLImageManager regression test for discard case | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -0/+53 |
| | | | |||||
| * | | Telehub Support: | BlueWall | 2012-01-20 | 1 | -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 command | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -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 LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 4 | -6/+98 |
| | | |||||
* | | Fix prim calculations so that > 32767 prims are supported | Melanie | 2012-01-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-16 | 1 | -5/+10 |
|\ \ | |/ | |||||
| * | Comment out noisy log lines I accidentally included in the nant build target ↵ | Justin Clark-Casey (justincc) | 2012-01-16 | 1 | -6/+6 |
| | | | | | | | | | | | | adjustment commit. Left in the method doc. | ||||
| * | Remove monocov and other obsolete nant build targets. | Justin Clark-Casey (justincc) | 2012-01-16 | 1 | -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 careminster | Melanie | 2012-01-10 | 2 | -5/+19 |
|\ \ | |/ | |||||
| * | Add "show image queue <first-name> <last-name>" region console command | Justin Clark-Casey (justincc) | 2012-01-10 | 2 | -5/+19 |
| | | | | | | | | This is so that we can inspect the image download queue (texture download via udp) for debugging purposes. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -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-06 | 1 | -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 uncommented | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -6/+6 |
| | | |||||
| * | Improve "app rebake" command to return a better message if no uploaded ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -6/+6 |
| | | | | | | | | texture ids were available for the rebake request | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 3 | -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-04 | 3 | -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-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 |
| | |