Ignore:
Timestamp:
Mar 29, 2015, 7:51:30 PM (10 years ago)
Author:
ldelgass
Message:

merge r5156 from trunk

Location:
branches/1.4
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/1.4

    • Property svn:mergeinfo changed
      /trunkmerged: 5156

  • branches/1.4/gui/scripts/vtkviewer.tcl

    r5143 r5172  
    142142    private variable _initialStyle;     # Array of initial component styles.
    143143    private variable _axis
    144     private variable _reset 1;          # Indicates that server was reset and
    145                                         # needs to be reinitialized.
     144    private variable _reset 1;          # Connection to server has been reset.
    146145    private variable _haveGlyphs 0
    147146    private variable _haveMolecules 0
    … …  
    865864        return 0
    866865    }
     866    set _reset 1
    867867    set result [VisViewer::Connect $_hosts]
    868868    if { $result } {
Note: See TracChangeset for help on using the changeset viewer.