| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Use Environment.TickCount & Int32.MaxValue; instead of ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound. This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff | |||||
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-01-31 | 1 | -11/+37 | |
| |\ \ \ | | | | | | | | | | | | | careminster | |||||
| | * | | | Draw brders around parcels for sale | Melanie | 2012-01-31 | 1 | -11/+37 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-01-31 | 8 | -5/+227 | |
| |\ \ \ \ | |/ / / |/| / / | |/ / | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs | |||||
| | * | | Remove scene object null check on SceneGraph.AddSceneObject(). Complain ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | explicitly if there's an attempt to add any object with a zero UUID. Callers themselves need to check that they're not attempting to add a null scene object. | |||||
| | * | | Add torture tests to test adding 10,000, 100,000 and 200,000 single prim ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 6 | -1/+211 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | scene objects. These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature. Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc. However, data can be inconsistent due to different machine circumstances and virtual machine actions. This area is under development. | |||||
| | * | | Fix:llSetText - limited text to a maximum of 254 chars | PixelTomsen | 2012-01-31 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | mantis: http://opensimulator.org/mantis/view.php?id=5867 Signed-off-by: nebadon <michael@osgrid.org> | |||||
| | * | | Make parcel sale overlays work. No auction support. | Melanie | 2012-01-31 | 2 | -7/+87 | |
| | | | | ||||||
| * | | | Make parcel sale overlays work. No auction support. | Melanie | 2012-01-31 | 2 | -7/+87 | |
| | | | | ||||||
| * | | | Comment debug spam | Melanie | 2012-01-30 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Fix displaying landmark and search info properly with long names | Melanie | 2012-01-30 | 1 | -1/+4 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-30 | 1 | -5/+7 | |
| |\ \ \ | |/ / | ||||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-30 | 1 | -5/+7 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-30 | 3 | -20/+46 | |
| | | |\ \ | ||||||
| | | * | | | lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if ↵ | Justin Clark-Casey (justincc) | 2012-01-30 | 1 | -5/+7 | |
| | | | | | | | | | | | | | | | | | | | | | SceneObjectGroupsByFullID is updated elsewhere at the same time. | |||||
| | * | | | | Use the requested sim's map, not our own | Melanie | 2012-01-30 | 1 | -2/+2 | |
| | | |/ / | |/| | | ||||||
| * | | | | Use the requested sim's map, not our own | Melanie | 2012-01-30 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-01-30 | 3 | -20/+46 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Patch in the rest of the maptile stuff | Melanie | 2012-01-30 | 1 | -3/+7 | |
| | | | | | ||||||
| | * | | | Add the needed column in the regions table and a few tweaks. | Melanie | 2012-01-30 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | Warning: Contains a Migration Warning: Cannot guarantee nut free | |||||
| | * | | | Next step for world map overlays | Melanie | 2012-01-30 | 2 | -3/+11 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-30 | 0 | -0/+0 | |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||||
| | | * | | Revert "Pickup map overlay tile from RegionSettings.ParcelImageID" | BlueWall | 2012-01-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 00d1c88c59c10aa8d34fa36910cf0f1f0e9878b8. Need to dig a little deeper to see exactly how V1 viewers are using this | |||||
| | * | | | Some plumbing for map overlays | Melanie | 2012-01-30 | 1 | -15/+20 | |
| | |/ / | ||||||
| | * | | Pickup map overlay tile from RegionSettings.ParcelImageID | BlueWall | 2012-01-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-01-30 | 5 | -10/+37 | |
| |\ \ \ | | | | | | | | | | | | | careminster | |||||
| | * | | | Add the ability to abort a pending restart using the viewer UI or a | Melanie | 2012-01-28 | 3 | -1/+28 | |
| | | | | | | | | | | | | | | | | | RemoteAdmin message | |||||
| | * | | | Fix calculating land prim count type width issue | Melanie | 2012-01-28 | 1 | -8/+8 | |
| | | | | | ||||||
| | * | | | Prevent an overlong description from messing up a ParcelInfoReply | Melanie | 2012-01-28 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-01-30 | 3 | -2/+18 | |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs | |||||
| | * | | | Add ParcelImageID to RegionSettings so we can have that overlay. | Melanie | 2012-01-30 | 3 | -2/+18 | |
| | | | | | | | | | | | | | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts. | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-01-29 | 5 | -6/+76 | |
| |\ \ \ \ | |/ / / | | / / | |/ / |/| | | ||||||
| | * | | Fix llEdgeOfWorld functionality - see mantis ↵ | Garmin Kawaguichi | 2012-01-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5865 Signed-off-by: nebadon <michael@osgrid.org> | |||||
| | * | | Fix:Get embedded objects in notecard ↵ | PixelTomsen | 2012-01-29 | 2 | -1/+72 | |
| | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2607 Signed-off-by: nebadon <michael@osgrid.org> | |||||
| | * | | Merge branch 'master' of /home/opensim/var/repo/opensim into mapwork | BlueWall | 2012-01-28 | 11 | -40/+150 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-28 | 11 | -40/+150 | |
| | | |\ \ | ||||||
| | * | | | | Adding our parcel's generated id to map packets | BlueWall | 2012-01-28 | 1 | -2/+2 | |
| | |/ / / | ||||||
| | * | | | Send CHANGED_TELEPORT during local TP again - partially revert ↵ | Bo Iwu | 2012-01-28 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | cf73afec356eed30e169be3ce71edad89b4fdb37 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | | | | Make all NPCs owned by default | Melanie | 2012-01-28 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-01-28 | 11 | -29/+130 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 11 | -29/+130 | |
| | |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||||
| | | * | | | Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry ↵ | Justin Clark-Casey (justincc) | 2012-01-28 | 1 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | | | | texEntry) for region modules | |||||
| | | * | | | Add experimental --publish option to "save oar" so that OARs reloaded to the ↵ | Justin Clark-Casey (justincc) | 2012-01-28 | 7 | -21/+116 | |
| | | | | | | | | | | | | | | | | | | | | | same grid don't have the publisher as owner. | |||||
| | | * | | | Remove accidental /user postfix from HomeURI in [HGInventoryAccessModule] in ↵ | Justin Clark-Casey (justincc) | 2012-01-28 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GridCommon.ini.example and from SRV_ProfileServerURI in [LoginService] in Robust.HG.ini.example As per http://opensimulator.org/mantis/view.php?id=5852, confirmed by diva via aiaustin | |||||
| | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-28 | 6 | -10/+10 | |
| | | |\ \ \ | | | |/ / | ||||||
| | | * | | | Comment out xfer section in Scene.UpdateTaskInventory() which was causing ↵ | Justin Clark-Casey (justincc) | 2012-01-28 | 1 | -13/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spurious errors and "script saved" messages when script properties were changed. Viewers since at least Linden Lab 1.23 use the script upload capability to save script changes. It's unknown whether the commented out code was working for very old viewers or not. Code is commented out to reduce complexity and so that useful error messages don't need to be removed. If there is a substantial population using extremely old viewers that can't upgrade to a newer version 1 viewer (e.g. 1.23) or similar TPV then this can be revisited. | |||||
| * | | | | | Fix build break | Melanie | 2012-01-28 | 1 | -1/+2 | |
| |/ / / / | ||||||
| * | | | | Completely disable NPC being sensed as agents, the abuse potential is too great | Melanie | 2012-01-28 | 2 | -5/+10 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 13 | -27/+93 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | Remove IClientAPI from the money module. It was only used to pass in the | Melanie | 2012-01-28 | 6 | -10/+10 | |
| | |/ / | | | | | | | | | | agent id anyway | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |