Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change parser to leave embedded quotes alone if the pattern is recognized | Melanie | 2012-02-10 | 1 | -0/+34 |
| | | | | as an OptionSet long option | ||||
* | Merge branch 'master' into careminster | Melanie | 2012-02-10 | 13 | -20/+244 |
|\ | | | | | | | | | | | 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 | 2 | -8/+8 |
| | | | | | | | | 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 | 6 | -11/+40 |
| | | | | | | | | | | | | | | | | 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 | ||||
| * | Fix another Torture test build break on Windows. | Justin Clark-Casey (justincc) | 2012-02-09 | 1 | -0/+1 |
| | | |||||
| * | If NPCModule.CreateNPC() fails to create the required ScenePresence (which ↵ | Justin Clark-Casey (justincc) | 2012-02-09 | 2 | -9/+8 |
| | | | | | | | | should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead. | ||||
| * | Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls. | Justin Clark-Casey (justincc) | 2012-02-09 | 2 | -0/+188 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-09 | 8 | -14/+70 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | minor: put in commented out logging statements for future reuse | Justin Clark-Casey (justincc) | 2012-02-09 | 2 | -1/+10 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-02-08 | 1 | -0/+1 |
| |\ | |||||
| | * | Add missing reference to prebuild.xml for torture tests | Robert Adams | 2012-02-07 | 1 | -0/+1 |
| | | | |||||
| * | | Stop a scene object from attempting to link with itself (which results in an ↵ | Justin Clark-Casey (justincc) | 2012-02-08 | 4 | -10/+54 |
| |/ | | | | | | | | | | | exception and constant complaints in v3 viewers). Aims to address http://opensimulator.org/mantis/view.php?id=5878 | ||||
| * | Make WebStats logging report consistently as WEB STATS MODULE instead of VC, ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -6/+5 |
| | | | | | | | | VS and WEBSTATS | ||||
* | | Push more NPC stuff into threads | Melanie | 2012-02-08 | 2 | -23/+40 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 14 | -111/+145 |
|\ \ | |/ | |||||
| * | Set UseMeshiesPhysicsMesh = true in [Mesh] by default | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -4/+3 |
| | | | | | | | | This means that uploaded meshes will get a physics (collision) mesh if uploaded with that option via a viewer. | ||||
| * | Add start GC memory and end GC memory to object stress test printouts. | Justin Clark-Casey (justincc) | 2012-02-07 | 4 | -4/+22 |
| | | | | | | | | | | This illustrates that references to Scene, SOG, etc. are not currently being released when a stress test ends (or at regression test end in general). This means even the current stress tests take much more memory than they need, a problem that will have to be addressed. | ||||
| * | Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 9 | -103/+120 |
| | | | | | | | | exception in service connectors | ||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-07 | 14 | -46/+336 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 14 | -46/+336 |
| |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | Add TestAddTaskInventoryItem() | Justin Clark-Casey (justincc) | 2012-02-07 | 2 | -4/+34 |
| | | | |||||
| | * | Add warning about only uncommenting EstateConnectionString if you know what ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -0/+2 |
| | | | | | | | | | | | | you're doing to GridCommon.ini.example (was already in StandaloneCommon.ini.example) | ||||
| | * | Remove debug logging if physics actor is null in SOP.ApplyPhysics() | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -5/+1 |
| | | | | | | | | | | | | This is not valid in the case of BasicPhysics which can return a null PhysicsActor (though I think it should really return a do-nothing PhysicsActor). | ||||
| | * | Add TestCompileAndStart100Scripts() torture test. | Justin Clark-Casey (justincc) | 2012-02-07 | 3 | -1/+160 |
| | | | |||||
| | * | Add a regression test to compile and start a script. Remove ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 7 | -37/+137 |
| | | | | | | | | | | | | | | | | | | | | | | | | Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory. Later path concatenation is already done by Path.Combine() which handles any trailing slash. Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory. | ||||
* | | | Experimental. Expand Fire & Forget for NPC delete | Melanie | 2012-02-06 | 1 | -7/+7 |
|/ / | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-05 | 7 | -12/+12 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Revert my two quick fixes for the lag issue and put in the real fix, which | Melanie | 2012-02-05 | 1 | -1/+2 |
| | | | | | | | | | | is to only write to the database if data was changed. I was writing to the db on every step of every avatar. Sure to give us lag, that. | ||||
| * | Revert "Remove checks on ban list expiry on every move. To be re-added on ↵ | Melanie | 2012-02-05 | 1 | -4/+4 |
| | | | | | | | | | | | | parcel" This reverts commit 35f14a262dfa3d9199f554154a63f5f532460f56. | ||||
| * | Revert "Check ban list for a particular parcel only when an avatar moves ↵ | Melanie | 2012-02-05 | 2 | -17/+4 |
| | | | | | | | | | | | | into it." This reverts commit 8923ad755d97d5ddb4a29cb6f543b53195f0b461. | ||||
| * | Make configuration uniform | BlueWall | 2012-02-05 | 1 | -3/+3 |
| | | | | | | | | Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini. | ||||
| * | Check ban list for a particular parcel only when an avatar moves into it. | Melanie | 2012-02-05 | 2 | -4/+17 |
| | | | | | | | | | | This restores functionality remove in the last commit without reintroducing the performance penalty. | ||||
| * | Remove checks on ban list expiry on every move. To be re-added on parcel | Melanie | 2012-02-05 | 1 | -4/+4 |
| | | | | | | | | | | boundary crossing only as soon as I'm properly awake. This should fix recent performance issues | ||||
| * | Set PhysPrimMax default to 0 so ini files won't be overridden | BlueWall | 2012-02-04 | 1 | -1/+1 |
| | | |||||
| * | change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make the | nebadon | 2012-02-04 | 1 | -1/+1 |
| | | | | | | | | variable in OpenSim.ini and Regions.ini match | ||||
| * | change NonPhysicalPrimMax to NonphysicalPrimMax to make this variable | nebadon | 2012-02-04 | 2 | -2/+2 |
| | | | | | | | | | | work correctly, it was being ignored because of the case, this effects OpenSim.ini.example and OpenSimDefaults.ini | ||||
| * | Make NonphysicalPrimMax setting work properly | BlueWall | 2012-02-04 | 1 | -1/+1 |
| | | | | | | | | RegionInfo setting will override only if it is > 0 | ||||
| * | Quiet the map module logging | BlueWall | 2012-02-04 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 34 | -254/+561 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * | Add default value to TelehubObject | BlueWall | 2012-02-04 | 1 | -0/+10 |
| | | |||||
| * | Supply correct parameters to detailed authentication login fail message | Justin Clark-Casey (justincc) | 2012-02-04 | 1 | -1/+1 |
| | | |||||
| * | Add missing RCERR_UNKNOWN and RCERR_SIM_PERF_LOW LSL constants that would ↵ | Justin Clark-Casey (justincc) | 2012-02-04 | 1 | -0/+2 |
| | | | | | | | | eventually be used by llCastRay(), though OpenSim does not use these yet. | ||||
| * | Correct RC_* LSL constants used by llCastRay(). | Justin Clark-Casey (justincc) | 2012-02-04 | 1 | -12/+12 |
| | | | | | | | | Many thanks to WhiteStar for doing the research on this. | ||||
| * | Add TestRegionSettingsDeserialize | Justin Clark-Casey (justincc) | 2012-02-04 | 2 | -1/+135 |
| | | |||||
| * | Only look for an uploaded transactional asset in Scene.UpdateTaskInventory ↵ | Justin Clark-Casey (justincc) | 2012-02-04 | 3 | -22/+21 |
| | | | | | | | | | | | | | | | | if we have been passed a non-zero transaction ID. This resolves the recent regression from deeb728 where notecards could not be saved in prim inventories. This looks like a better solution than deeb728 since only non-caps updates pass in a transaction ID. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5873 | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-02-03 | 19 | -37/+69 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim | Snoopy Pfeffer | 2012-02-04 | 23 | -146/+312 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-03 | 13 | -17/+50 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-03 | 13 | -17/+50 |
| | | | |\ | |||||
| | | | | * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 13 | -17/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> |