diff options
author | Melanie | 2011-04-08 03:50:27 +0200 |
---|---|---|
committer | Melanie | 2011-04-08 03:50:27 +0200 |
commit | 33dd74e410bcd95364d8029a3f2a21b522c9f9d2 (patch) | |
tree | 06d8a6e482ad1dd464a8f4cd292275a9878f133d /OpenSim/Region/Framework | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-33dd74e410bcd95364d8029a3f2a21b522c9f9d2.zip opensim-SC-33dd74e410bcd95364d8029a3f2a21b522c9f9d2.tar.gz opensim-SC-33dd74e410bcd95364d8029a3f2a21b522c9f9d2.tar.bz2 opensim-SC-33dd74e410bcd95364d8029a3f2a21b522c9f9d2.tar.xz |
Add support for the new display name related functions in LSL. This does not
implement the display names functionality as such, but it allows scripts
that are display name aware to function as if the display name were implemented
and set to the avatar name.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2e82e1f..0e3cffb 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1337,12 +1337,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1337 | terrainMS = Util.EnvironmentTickCountSubtract(terMS); | 1337 | terrainMS = Util.EnvironmentTickCountSubtract(terMS); |
1338 | } | 1338 | } |
1339 | 1339 | ||
1340 | if (Frame % m_update_land == 0) | 1340 | // if (Frame % m_update_land == 0) |
1341 | { | 1341 | // { |
1342 | int ldMS = Util.EnvironmentTickCount(); | 1342 | // int ldMS = Util.EnvironmentTickCount(); |
1343 | UpdateLand(); | 1343 | // UpdateLand(); |
1344 | landMS = Util.EnvironmentTickCountSubtract(ldMS); | 1344 | // landMS = Util.EnvironmentTickCountSubtract(ldMS); |
1345 | } | 1345 | // } |
1346 | 1346 | ||
1347 | frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS); | 1347 | frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS); |
1348 | otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS; | 1348 | otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS; |