67e7f25d6c
Merge commit 'c9c40343afb313ee6999c6dfb2663fb06bfac407' into bigmerge
2011-10-11 22:32:21 +01:00
6101de2316
Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-11 22:32:10 +01:00
9935eb6578
Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge
2011-10-11 22:26:18 +01:00
a4ba99f020
Merge commit '7829b7a6019454b8e83497456bea81539c9a4234' into bigmerge
2011-10-11 22:25:03 +01:00
6e6c70be15
Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmerge
2011-10-11 22:24:40 +01:00
1ba53850b2
Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmerge
2011-10-11 22:23:40 +01:00
34954172a1
Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge
2011-10-11 22:23:16 +01:00
36ec9f0e94
Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge
2011-10-11 22:22:49 +01:00
b9de3b7f5b
Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge
...
Conflicts:
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
prebuild.xml
2011-10-11 22:22:34 +01:00
fe3594c5ea
Start recording object updates per second statistic (analogue of agent updates per secod) and expose via monitoring module as ObjectUpdatePerSecondMonitor
...
A useful diagnostic to find out how object updates are burdening a scene
2011-10-11 22:17:05 +01:00
071c3fe721
Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge
2011-10-11 22:15:44 +01:00
03d533dc1e
Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge
2011-10-11 22:15:25 +01:00
45ce8db5db
Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmerge
2011-10-11 22:14:17 +01:00
341efb0942
Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge
2011-10-11 22:12:25 +01:00
68a42af30f
Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge
2011-10-11 22:11:55 +01:00
6978ae0a59
Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-11 22:11:44 +01:00
117d24be54
Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge
2011-10-11 21:45:01 +01:00
634fbca6bb
Merge commit 'c695e23dd9474e31b031e4d1f57b23aba386145a' into bigmerge
2011-10-11 21:41:46 +01:00
a8747b3888
Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmerge
2011-10-11 21:41:30 +01:00
189f766b8b
Merge commit '30b68388378f96f83b3f9509f72664869a6c20c6' into bigmerge
2011-10-11 21:32:49 +01:00
f1fa059b37
Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge
2011-10-11 21:32:24 +01:00
3ac15c03b2
Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge
2011-10-11 21:32:14 +01:00
0fa21b7b5e
Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmerge
2011-10-11 21:31:48 +01:00
673886d231
Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge
2011-10-11 21:30:42 +01:00
986a3838a6
Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge
2011-10-11 21:29:58 +01:00
288f5bd727
Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmerge
2011-10-11 21:29:38 +01:00
5b40389352
Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge
2011-10-11 21:29:04 +01:00
8fac7c0650
Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
2011-10-11 21:28:23 +01:00
9d22110c23
Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge
2011-10-11 21:22:58 +01:00
cc1fe354d0
Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 21:21:44 +01:00
859a804d59
Merge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 21:10:55 +01:00
c95c8ab246
Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 21:06:06 +01:00
7d2a3dc174
Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 20:57:31 +01:00
f138a2056e
meaningless change to goose panda
2011-10-11 00:29:41 +01:00
28f549bd64
osSetParcelDetails - PARCEL_DETAILS_CLAIMDATE
...
this new flag set parcels claim date
value 0 for this flag set current unixstamp
http://opensimulator.org/mantis/view.php?id=5725
2011-10-11 00:13:26 +01:00
353e7ce873
Allow monitoring of stats by region name
2011-10-10 23:58:27 +01:00
62aad4c18f
Add other region stats (total frame time, physics fps, etc.) currently missing from MonitorModule
...
Unlike the other 3 stats mechanisms, monitor data can be queried per individual region, which makes this useful.
This doesn't affect an of the existing monitored stats.
2011-10-10 23:48:53 +01:00
19096bd391
Convert getLastReportedSimFPS() and getLastReportedSimStats() into more idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter
2011-10-10 22:23:42 +01:00
8114f895c2
Provide a way to turn the MonitorModule on and off
...
Default is currently on since this is the historical setting
2011-10-10 22:17:29 +01:00
2b290793ab
refactor: have lsl and ossl interrogate scene.StatsReporter directly rather than going through scene
...
I know this goes against the law of demeter but I don't think it's that useful here and I'd rather get rid of nasty little wrapper methods
2011-10-10 21:54:08 +01:00
013bf2775f
remove unused LastAssetID from DynamicTextureUpdaer
2011-10-10 15:19:23 +01:00
156385f48b
Tweak to language of last commit in rejecting UUID.Zero in GridService.RegisterRegion()
...
Allowing regions with UUID.Zero causes problems elsewhere according to http://opensimulator.org/mantis/view.php?id=3426
It's probably a bad idea to allow these in any case.
2011-10-08 02:15:04 +01:00
a6c5e00c45
GridService - Region UUID can not be NULL
...
http://opensimulator.org/mantis/view.php?id=3426
2011-10-08 02:13:18 +01:00
29660fe175
Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() check on XMLRPC RemoteAdmin handlers.
...
If admin is disabled then the XMLRPC handlers are never registered, which means that they cannot be called anyway.
2011-10-08 02:00:36 +01:00
71d29decc8
replace List used by m_accessIP in RemoteAdminPlugin with the more efficient HashSet
2011-10-08 01:53:10 +01:00
5551542c28
Improve explanation of access_ip_addresses in [RemoteAdmin] to say that there are no restrictions if not set
2011-10-08 01:39:27 +01:00
4073cd6ced
Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.
...
Also adds password check to some functions where this was missing and fixes some parameter checking.
This is a patch from http://opensimulator.org/mantis/view.php?id=5715 with a few small unrelated spacing tweaks from me.
Thanks Michelle Argus.
2011-10-08 01:23:26 +01:00
ff80113534
Go back to lying that sim fps is 55 when it's actually locked at a maximum of 11.
...
We're been lying since 2008 so I'm sure another few years can't hurt.
To know the real fps, either divide sim fps by 5 and/or look at the frame time.
2011-10-08 00:15:15 +01:00
f8c06c6114
flip master version up to 0.7.3
2011-10-07 23:41:55 +01:00
b5e6209cfd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-07 21:44:45 +01:00
Melanie