diff options
| author | Melanie | 2013-05-08 21:51:48 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-08 21:51:48 +0100 |
| commit | cdaceea5a633683c713f084d9beb93a14061772f (patch) | |
| tree | 66798e45deff0d13e78740130dde68955a3ba86c /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Guard the scene list when estates are updated (diff) | |
| download | opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.zip opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.tar.gz opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.tar.bz2 opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 60e4be2..a5a43b1 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -679,6 +679,9 @@ | |||
| 679 | ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others). | 679 | ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others). |
| 680 | ResendAppearanceUpdates = true | 680 | ResendAppearanceUpdates = true |
| 681 | 681 | ||
| 682 | ; Turning this on responds to CachedTexture packets to possibly avoid rebaking the avatar | ||
| 683 | ; on every login | ||
| 684 | ReuseTextures = false | ||
| 682 | 685 | ||
| 683 | [Attachments] | 686 | [Attachments] |
| 684 | ; Controls whether avatar attachments are enabled. | 687 | ; Controls whether avatar attachments are enabled. |