aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-1017-34/+309
|\ | | | | | | | | Conflicts: prebuild.xml
| * Merge branch 'master' into careminsterMelanie2012-02-1013-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) ↵PixelTomsen2012-02-102-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-106-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-091-0/+1
| | |
| | * If NPCModule.CreateNPC() fails to create the required ScenePresence (which ↵Justin Clark-Casey (justincc)2012-02-092-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-092-0/+188
| | |
| * | Merge branch 'master' into careminsterMelanie2012-02-098-14/+70
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| | * minor: put in commented out logging statements for future reuseJustin Clark-Casey (justincc)2012-02-092-1/+10
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-081-0/+1
| | |\
| | | * Add missing reference to prebuild.xml for torture testsRobert Adams2012-02-071-0/+1
| | | |
| | * | Stop a scene object from attempting to link with itself (which results in an ↵Justin Clark-Casey (justincc)2012-02-084-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-071-6/+5
| | | | | | | | | | | | VS and WEBSTATS
* | | Changes to vehicles code etc. Includes some debug aids to remove later.UbitUmarov2012-02-104-243/+145
| | |
* | | initial introdution of physics actor building control.UbitUmarov2012-02-085-11/+60
| | |
* | | first change in SOP. in AddPrimShape(..) give physics the world rotation and ↵UbitUmarov2012-02-081-2/+4
| | | | | | | | | | | | not local offset. Currently physics interface only knows about world frame
* | | files need to run UbitODE in linux ( untested )UbitUmarov2012-02-083-0/+7
| | |
* | | changes needed to compile UbitODE, also changes project name to ↵UbitUmarov2012-02-083-4/+35
| | | | | | | | | | | | "Careminter". untested on linux
* | | changes in physics manager, needed for UbitODEUbitUmarov2012-02-082-1/+28
| | |
* | | UbitODE plugin initial commitUbitUmarov2012-02-0810-0/+11556
|/ /
* | Push more NPC stuff into threadsMelanie2012-02-082-23/+40
| |
* | Merge branch 'master' into careminsterMelanie2012-02-0714-111/+145
|\ \ | |/
| * Set UseMeshiesPhysicsMesh = true in [Mesh] by defaultJustin Clark-Casey (justincc)2012-02-071-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-074-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-079-103/+120
| | | | | | | | exception in service connectors
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-0714-46/+336
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-0714-46/+336
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| | * Add TestAddTaskInventoryItem()Justin Clark-Casey (justincc)2012-02-072-4/+34
| | |
| | * Add warning about only uncommenting EstateConnectionString if you know what ↵Justin Clark-Casey (justincc)2012-02-071-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-071-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-073-1/+160
| | |
| | * Add a regression test to compile and start a script. Remove ↵Justin Clark-Casey (justincc)2012-02-077-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 deleteMelanie2012-02-061-7/+7
|/ /
* | Merge branch 'master' into careminsterMelanie2012-02-057-12/+12
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Revert my two quick fixes for the lag issue and put in the real fix, whichMelanie2012-02-051-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 ↵Melanie2012-02-051-4/+4
| | | | | | | | | | | | parcel" This reverts commit 35f14a262dfa3d9199f554154a63f5f532460f56.
| * Revert "Check ban list for a particular parcel only when an avatar moves ↵Melanie2012-02-052-17/+4
| | | | | | | | | | | | into it." This reverts commit 8923ad755d97d5ddb4a29cb6f543b53195f0b461.
| * Make configuration uniformBlueWall2012-02-051-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.Melanie2012-02-052-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 parcelMelanie2012-02-051-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 overriddenBlueWall2012-02-041-1/+1
| |
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
| | | | | | | | variable in OpenSim.ini and Regions.ini match
| * change NonPhysicalPrimMax to NonphysicalPrimMax to make this variablenebadon2012-02-042-2/+2
| | | | | | | | | | work correctly, it was being ignored because of the case, this effects OpenSim.ini.example and OpenSimDefaults.ini
| * Make NonphysicalPrimMax setting work properlyBlueWall2012-02-041-1/+1
| | | | | | | | RegionInfo setting will override only if it is > 0
| * Quiet the map module loggingBlueWall2012-02-041-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-02-0434-254/+561
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Add default value to TelehubObjectBlueWall2012-02-041-0/+10
| |
| * Supply correct parameters to detailed authentication login fail messageJustin Clark-Casey (justincc)2012-02-041-1/+1
| |
| * Add missing RCERR_UNKNOWN and RCERR_SIM_PERF_LOW LSL constants that would ↵Justin Clark-Casey (justincc)2012-02-041-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-041-12/+12
| | | | | | | | Many thanks to WhiteStar for doing the research on this.
generated by cgit v1.1 at 2024-11-15 16:39:37 +0000