[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36107] trunk/blender/release/windows/ installer/00.sconsblender.nsi: small patch from Dobz to clean up non-functional multiuser code for now, and ensure admin level is requested on starting.

[Nathan Letwory]

Revision: 36107
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36107
Author:   jesterking
Date:     2011-04-12 08:41:26 +0000 (Tue, 12 Apr 2011)
Log Message:
-----------
small patch from Dobz to clean up non-functional multiuser code for now, and ensure admin level is requested on starting.

Modified Paths:
--------------
    trunk/blender/release/windows/installer/00.sconsblender.nsi

Modified: trunk/blender/release/windows/installer/00.sconsblender.nsi
===================================================================
--- trunk/blender/release/windows/installer/00.sconsblender.nsi	2011-04-12 04:23:38 UTC (rev 36106)
+++ trunk/blender/release/windows/installer/00.sconsblender.nsi	2011-04-12 08:41:26 UTC (rev 36107)
@@ -3,21 +3,18 @@
 ;
 ; Blender Self-Installer for Windows (NSIS - http://nsis.sourceforge.net)
 ;
-; Requires the MoreInfo plugin - http://nsis.sourceforge.net/MoreInfo_plug-in
-;
 
 SetCompressor /SOLID lzma
 
 Name "Blender [VERSION]" 
 
-!define MULTIUSER_EXECUTIONLEVEL Admin
+RequestExecutionLevel admin
 
 !include "MUI.nsh"
 !include "WinVer.nsh"
 !include "FileFunc.nsh"
 !include "WordFunc.nsh"
 !include "nsDialogs.nsh"
-!include "MultiUser.nsh"
 !include "x64.nsh"
 
 !define MUI_ABORTWARNING
@@ -206,7 +203,7 @@
 SectionEnd
 
 Section "Open .blend files with Blender" BlendRegister
-ExecWait '"$INSTDIR\blender.exe" -r'
+  ExecWait '"$INSTDIR\blender.exe" -r'
 SectionEnd
 
 UninstallText "This will uninstall Blender [VERSION], and all installed files. Before continuing make sure you have created backup of all the files you may want to keep: startup.blend, bookmarks.txt, recent-files.txt. Hit 'Uninstall' to continue."