83868c0387
revert project name to OpenSim and not Careminster
2012-02-11 01:07:57 +00:00
43a74d8481
test on git
2012-02-10 23:51:55 +00:00
e3f5fd81f1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
prebuild.xml
2012-02-10 23:03:30 +00:00
7cf73cb92a
Changes to vehicles code etc. Includes some debug aids to remove later.
2012-02-10 22:43:51 +00:00
215acbcc96
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-02-10 10:20:51 +00:00
7273e05995
Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.org/mantis/view.php?id=3731
2012-02-10 02:30:55 +00:00
ddca5347c3
When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer 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
2012-02-10 02:13:15 +00:00
e8cc1bd329
Fix another Torture test build break on Windows.
2012-02-09 20:12:29 +00:00
9c84a8162f
If NPCModule.CreateNPC() fails to create the required ScenePresence (which should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
2012-02-09 01:17:59 +00:00
16c4636048
Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls.
2012-02-09 00:38:09 +00:00
7c888f6af1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-02-09 00:19:37 +00:00
dbe32a1f6d
minor: put in commented out logging statements for future reuse
2012-02-09 00:10:45 +00:00
6af01f6767
initial introdution of physics actor building control.
2012-02-08 23:14:53 +00:00
3fa61c4a39
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-08 22:21:15 +00:00
dfa19e23f0
Stop a scene object from attempting to link with itself (which results in an exception and constant complaints in v3 viewers).
...
Aims to address http://opensimulator.org/mantis/view.php?id=5878
2012-02-08 22:19:34 +00:00
6cc9aa30ac
first change in SOP. in AddPrimShape(..) give physics the world rotation and not local offset. Currently physics interface only knows about world frame
2012-02-08 15:45:44 +00:00
754129b903
files need to run UbitODE in linux ( untested )
2012-02-08 15:33:51 +00:00
12c3239666
changes needed to compile UbitODE, also changes project name to "Careminter". untested on linux
2012-02-08 15:29:48 +00:00
c75fa8b8a1
changes in physics manager, needed for UbitODE
2012-02-08 15:28:13 +00:00
815f3af1d7
UbitODE plugin initial commit
2012-02-08 15:24:10 +00:00
9c6ba8d18f
Push more NPC stuff into threads
2012-02-08 13:04:23 +01:00
d5c08c44bf
Add missing reference to prebuild.xml for torture tests
2012-02-07 16:40:09 -08:00
bef2a368f4
Make WebStats logging report consistently as WEB STATS MODULE instead of VC, VS and WEBSTATS
2012-02-07 23:38:53 +00:00
236e1c45f2
Merge branch 'master' into careminster
2012-02-07 23:30:48 +00:00
a4367e75d3
Set UseMeshiesPhysicsMesh = true in [Mesh] by default
...
This means that uploaded meshes will get a physics (collision) mesh if uploaded with that option via a viewer.
2012-02-07 23:15:23 +00:00
c87751a822
Add start GC memory and end GC memory to object stress test printouts.
...
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.
2012-02-07 23:03:53 +00:00
1f402fdf5e
Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an exception in service connectors
2012-02-07 21:40:28 +00:00
bd928218dd
Add TestAddTaskInventoryItem()
2012-02-07 21:00:47 +00:00
773994723a
Add warning about only uncommenting EstateConnectionString if you know what you're doing to GridCommon.ini.example (was already in StandaloneCommon.ini.example)
2012-02-07 20:35:04 +00:00
7583768b9e
Remove debug logging if physics actor is null in SOP.ApplyPhysics()
...
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).
2012-02-07 20:26:26 +00:00
de255321f1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-07 20:52:04 +01:00
37049180f6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-07 21:09:04 +00:00
c22970448f
Add TestCompileAndStart100Scripts() torture test.
2012-02-07 19:42:32 +00:00
038d1bf742
Add a regression test to compile and start a script. Remove 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.
2012-02-07 17:44:37 +00:00
a829f20828
Experimental. Expand Fire & Forget for NPC delete
2012-02-06 22:26:25 +01:00
54fc78013d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-02-05 20:58:04 +00:00
130b1c0665
Revert my two quick fixes for the lag issue and put in the real fix, which
...
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.
2012-02-05 20:47:02 +00:00
a5fcdde179
Revert "Remove checks on ban list expiry on every move. To be re-added on parcel"
...
This reverts commit 35f14a262d
2012-02-05 20:12:45 +00:00
0904772a6f
Revert "Check ban list for a particular parcel only when an avatar moves into it."
...
This reverts commit 8923ad755d
2012-02-05 20:12:35 +00:00
4e11983c7c
Make configuration uniform
...
Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini.
2012-02-05 12:38:20 -05:00
8923ad755d
Check ban list for a particular parcel only when an avatar moves into it.
...
This restores functionality remove in the last commit without reintroducing
the performance penalty.
2012-02-05 04:03:32 +00:00
35f14a262d
Remove checks on ban list expiry on every move. To be re-added on parcel
...
boundary crossing only as soon as I'm properly awake. This should fix
recent performance issues
2012-02-05 03:44:15 +00:00
13999dfc1d
Set PhysPrimMax default to 0 so ini files won't be overridden
2012-02-04 21:52:55 -05:00
36ed0dcdaa
change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make the
...
variable in OpenSim.ini and Regions.ini match
2012-02-04 19:45:10 -07:00
44badf452e
change NonPhysicalPrimMax to NonphysicalPrimMax to make this variable
...
work correctly, it was being ignored because of the case, this effects
OpenSim.ini.example and OpenSimDefaults.ini
2012-02-04 19:41:25 -07:00
df07b97abd
Make NonphysicalPrimMax setting work properly
...
RegionInfo setting will override only if it is > 0
2012-02-04 21:30:16 -05:00
43b4e4cfc3
Quiet the map module logging
2012-02-04 19:08:52 -05:00
ce5e900721
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-02-04 11:48:20 +00:00
6034e5d112
Add default value to TelehubObject
2012-02-04 00:28:22 -05:00
8779ff3c8f
Supply correct parameters to detailed authentication login fail message
2012-02-04 02:00:35 +00:00
UbitUmarov