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 | ||||
* | 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 |
| | |||||
* | 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 |
| |/ |/| | |||||
* | | 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 |
| | |||||
* | 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. | ||||
* | 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 |
| |\ | |||||
| | * | 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. | ||||
* | | | | 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> | ||||
* | | Remove IClientAPI from the money module. It was only used to pass in the | Melanie | 2012-01-28 | 6 | -10/+10 |
|/ | | | | agent id anyway | ||||
* | Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate(). | Justin Clark-Casey (justincc) | 2012-01-28 | 7 | -17/+83 |
| | | | | | This allows NPCs to be sensed as agents by LSL sensors rather than as a specific NPC type (which is currently an OpenSimulator-only extension). Wiki doc on this and other recent NPC functions will follow soon | ||||
* | Increment LPS script stat for OSSL functions that were not already doing this | Justin Clark-Casey (justincc) | 2012-01-27 | 1 | -2/+41 |
| | |||||
* | Implement osIsNpc(key npc):integer. This return TRUE if the given key ↵ | Justin Clark-Casey (justincc) | 2012-01-27 | 3 | -0/+29 |
| | | | | belongs to an NPC in the region. FALSE if not or if the NPC module isn't present. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-27 | 8 | -17/+139 |
|\ | |||||
| * | HG Inventoty: Guard against items not found. | Diva Canto | 2012-01-26 | 1 | -6/+7 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-26 | 1 | -0/+30 |
| |\ | |||||
| | * | Support rejecting a teleport if a user is banned in all parcels that have | Melanie | 2012-01-26 | 1 | -0/+30 |
| | | | | | | | | | | | | spawn points | ||||
| * | | llManageEstateAccess implementation ↵ | PixelTomsen | 2012-01-26 | 5 | -0/+89 |
| |/ | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlManageEstateAccess Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | Change references from sop to sog and add protection from null ref | BlueWall | 2012-01-26 | 1 | -11/+13 |
| | | | | | | | | I had code made additions to the map module that was based on the earlier work that I did before Melanie made improvements. Updating the new code to incorporate the same changes. | ||||
* | | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ↵ | Justin Clark-Casey (justincc) | 2012-01-27 | 4 | -20/+56 |
|/ | | | | | | | NPC, the npc's own key for an 'unowned' NPC and NULL_KEY is the input key was not an npc. llGetOwnerKey() could also be extended but this does not allow one to distinguish between an unowned NPC and some other result (e.g. 'no such object' if NULL_KEY is the return. Also, any future extensions to LSL functions by Linden Lab are unpredictable and OpenSim-specific extensions could clash. | ||||
* | Add basic TestAddScript() regression test | Justin Clark-Casey (justincc) | 2012-01-26 | 2 | -0/+87 |
| | |||||
* | Re-enable error logging associated with assembly and script loading failure ↵ | Justin Clark-Casey (justincc) | 2012-01-26 | 1 | -9/+19 |
| | | | | | | in ScriptInstance. Swallowing exceptions just leads to more mysterious failures later on. | ||||
* | refactor: change RezScriptFromAgentInventory(), RezNewScript() and ↵ | Justin Clark-Casey (justincc) | 2012-01-26 | 3 | -37/+40 |
| | | | | | | AddInventoryItem() to accept an agent id rather than a full IClientAPI. This stops some code having to make spurious client == null checks and reduces regression test complexity. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-25 | 9 | -12/+38 |
|\ | |||||
| * | Update save oar and save iar help responses to reflect new -h|--home | nebadon | 2012-01-25 | 2 | -4/+4 |
| | | | | | | | | | | switches which replace -p|--profile ie: "save oar --home=http://hg.osgrid.org:80 region.oar" | ||||
| * | Update BulletSim.dll with some interface changes and tuning (see ↵ | Robert Adams | 2012-01-25 | 7 | -8/+34 |
| | | | | | | | | opensim-libs). Change BSScene to use new interface. | ||||
* | | refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), ↵ | Justin Clark-Casey (justincc) | 2012-01-25 | 2 | -80/+97 |
|/ | | | | RezNewScript() and rename one RezScript() to RezScriptFromPrim() | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-25 | 7 | -22/+100 |
|\ | |||||
| * | llGetParcelMusicURL implementation ↵ | Pixel Tomsen | 2012-01-25 | 5 | -1/+34 |
| | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlGetParcelMusicURL Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-25 | 2 | -8/+51 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-01-24 | 1 | -3/+51 |
| | |\ |