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
edc11a1d39
Add missing RCERR_UNKNOWN and RCERR_SIM_PERF_LOW LSL constants that would eventually be used by llCastRay(), though OpenSim does not use these yet.
2012-02-04 01:04:00 +00:00
09d6521361
Correct RC_* LSL constants used by llCastRay().
...
Many thanks to WhiteStar for doing the research on this.
2012-02-04 01:00:11 +00:00
6c252a0fa1
Add TestRegionSettingsDeserialize
2012-02-04 00:55:03 +00:00
9b762a5a84
Only look for an uploaded transactional asset in Scene.UpdateTaskInventory if we have been passed a non-zero transaction ID.
...
This resolves the recent regression from deeb728deeb728http://opensimulator.org/mantis/view.php?id=5873
2012-02-04 00:20:27 +00:00
2b6c5fcb31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-03 23:48:12 +00:00
312e1457dd
Change SceneObjectSerializer to use common ExternalRepresentationUtils.ExecuteReadProcessors() methods.
...
Adds ability to submit a customized exception message to match logging.
2012-02-03 23:47:01 +00:00
bd9d7484f0
Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim
2012-02-04 00:39:58 +01:00
4f8f44d9c3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-03 15:21:37 -08:00
ea19e50919
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-02-03 15:21:07 -08:00
0742630d81
Merge branch 'master' of /home/opensim/src/opensim
2012-02-03 18:20:26 -05:00
107cef2b0e
Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before triggering events on a potentially null Scene
2012-02-03 15:18:48 -08:00
ce34b359ad
Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene presence and population of m_avatars.
...
This is required to stop a race where the SensorRepeat module can detect an NPC avatar before m_avatars is populated.
Extending the lock is the easiest to understand solution rather than getting complicated with null checks.
Hopefully resolves http://opensimulator.org/mantis/view.php?id=5872
2012-02-03 23:04:26 +00:00
5c545d1d2e
Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-02-03 18:02:51 -05:00
83ef13a79a
Changed save oar and save iar parameter -p|--profile to -h|--home, including corresponding RemoteAdmin parameter
2012-02-03 23:53:18 +01:00
6234264211
Refactor common deserialization processor code to generic method ExternalRepresentationUtils.ExecuteReadProcessors()
2012-02-03 22:45:50 +00:00
f17066b7bf
Change LandDataSerializer deserialization so that in the future it won't care about extra elements or element order.
...
This brings it into line with other deserializations such as object and will improve future backward compatibility.
2012-02-03 22:21:54 +00:00
1a18948935
Corrected console help texts for "save iar"
2012-02-03 23:04:18 +01:00
0dbfa70443
Merge branch 'master' into careminster
2012-02-03 08:47:26 +00:00
61adf36339
Commenting out new event until I can fix OpenSim tests. Currently, testing objects does not create a Scene or EventManager so triggering events crashes some tests
2012-02-02 18:19:22 -08:00
ed846f11f1
OpenSim tests do not always create an EventManager so calls to trigger events during tests must check for null EventManager
2012-02-02 18:06:34 -08:00
3257dbe76d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-02 17:44:11 -08:00
146d78edfa
ObjectAddedToScene event should be fired when duplicating objects
2012-02-02 17:41:05 -08:00
ee2b2aadc3
fix line endings
2012-02-02 17:39:05 -08:00
bce5dfe711
Merge branch 'master' into careminster
2012-02-03 00:09:05 +00:00
76a658324c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-03 00:07:23 +00:00
573a64ad24
Merge branch 'master' into careminster
2012-02-03 00:05:59 +00:00
574c240202
Fix test failure
2012-02-03 00:05:36 +00:00
bdc31bddfc
Merge branch 'master' into careminster
2012-02-02 23:41:27 +00:00
447a66d660
Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more
...
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
2012-02-02 23:40:56 +00:00
54d473e200
D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not llGetLinkNumber().
2012-02-02 23:35:16 +00:00
264c83aec4
Add llGetLinkNumberOfSides to LSL_Stub and ILSL_Api
...
It already existed in LSL_Api but it also needs to exist in these two other places for a script to be able to see it.
Hopefully resolves http://opensimulator.org/mantis/view.php?id=5489
2012-02-02 22:48:36 +00:00
8f8b5f9a4d
Merge branch 'master' into careminster
2012-02-02 22:36:41 +00:00
07c487a28f
Make ban, eject, freeze and the scripted versions of those work.
2012-02-02 21:36:45 +01:00
17df4185ce
Add stress tests for simple object add of 100 prim objects. Add time taken to output (this is unreliable).
2012-02-02 18:42:27 +00:00
dbf6381e34
OpenID: server connector had a copy-and-paste error that made identity queries fail.
2012-02-02 08:39:23 -08:00
Melanie