diff options
| -rw-r--r-- | indra/newview/app_settings/camera/Front.xml | 22 | ||||
| -rw-r--r-- | indra/newview/app_settings/camera/Rear.xml | 22 | ||||
| -rw-r--r-- | indra/newview/app_settings/camera/Side.xml | 22 | ||||
| -rw-r--r-- | indra/newview/llpresetsmanager.cpp | 2 | 
4 files changed, 0 insertions, 68 deletions
diff --git a/indra/newview/app_settings/camera/Front.xml b/indra/newview/app_settings/camera/Front.xml index 39f44e11a8..f96d3bc779 100644 --- a/indra/newview/app_settings/camera/Front.xml +++ b/indra/newview/app_settings/camera/Front.xml @@ -1,16 +1,5 @@  <llsd>      <map> -    <key>AppearanceCameraMovement</key> -        <map> -        <key>Comment</key> -            <string>When entering appearance editing mode, camera zooms in on currently selected portion of avatar</string> -        <key>Persist</key> -            <integer>1</integer> -        <key>Type</key> -            <string>Boolean</string> -        <key>Value</key> -            <integer>1</integer> -        </map>      <key>AvatarSitRotation</key>      <map>          <key>Comment</key> @@ -90,17 +79,6 @@          <key>Value</key>              <real>0.90322577953338623</real>          </map> -    <key>EditCameraMovement</key> -        <map> -        <key>Comment</key> -            <string>When entering build mode, camera moves up above avatar</string> -        <key>Persist</key> -            <integer>1</integer> -        <key>Type</key> -            <string>Boolean</string> -        <key>Value</key> -            <integer>0</integer> -        </map>      <key>FocusOffsetRearView</key>          <map>          <key>Comment</key> diff --git a/indra/newview/app_settings/camera/Rear.xml b/indra/newview/app_settings/camera/Rear.xml index 8dc36353ce..7eda566e48 100644 --- a/indra/newview/app_settings/camera/Rear.xml +++ b/indra/newview/app_settings/camera/Rear.xml @@ -1,16 +1,5 @@  <llsd>      <map> -    <key>AppearanceCameraMovement</key> -        <map> -        <key>Comment</key> -            <string>When entering appearance editing mode, camera zooms in on currently selected portion of avatar</string> -        <key>Persist</key> -            <integer>1</integer> -        <key>Type</key> -            <string>Boolean</string> -        <key>Value</key> -            <integer>1</integer> -        </map>      <key>AvatarSitRotation</key>      <map>          <key>Comment</key> @@ -90,17 +79,6 @@          <key>Value</key>              <real>0.90322577953338623</real>          </map> -    <key>EditCameraMovement</key> -        <map> -        <key>Comment</key> -            <string>When entering build mode, camera moves up above avatar</string> -        <key>Persist</key> -            <integer>1</integer> -        <key>Type</key> -            <string>Boolean</string> -        <key>Value</key> -            <integer>0</integer> -        </map>      <key>FocusOffsetRearView</key>          <map>          <key>Comment</key> diff --git a/indra/newview/app_settings/camera/Side.xml b/indra/newview/app_settings/camera/Side.xml index 089ab93a8f..77f73f1df1 100644 --- a/indra/newview/app_settings/camera/Side.xml +++ b/indra/newview/app_settings/camera/Side.xml @@ -1,16 +1,5 @@  <llsd>      <map> -    <key>AppearanceCameraMovement</key> -        <map> -        <key>Comment</key> -            <string>When entering appearance editing mode, camera zooms in on currently selected portion of avatar</string> -        <key>Persist</key> -            <integer>1</integer> -        <key>Type</key> -            <string>Boolean</string> -        <key>Value</key> -            <integer>1</integer> -        </map>      <key>AvatarSitRotation</key>      <map>          <key>Comment</key> @@ -90,17 +79,6 @@          <key>Value</key>              <real>0.90322577953338623</real>          </map> -    <key>EditCameraMovement</key> -        <map> -        <key>Comment</key> -            <string>When entering build mode, camera moves up above avatar</string> -        <key>Persist</key> -            <integer>1</integer> -        <key>Type</key> -            <string>Boolean</string> -        <key>Value</key> -            <integer>0</integer> -        </map>      <key>FocusOffsetRearView</key>          <map>          <key>Comment</key> diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index 30d0a22ef0..bc77588b9f 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -254,8 +254,6 @@ void LLPresetsManager::getControlNames(std::vector<std::string>& names)  		// From panel_preferences_move.xml  		("CameraAngle")  		("CameraOffsetScale") -		("EditCameraMovement") -		("AppearanceCameraMovement")  		// From llagentcamera.cpp  		("CameraOffsetBuild")  		("TrackFocusObject")  | 
