Compare commits
				merge into: OpenSim:master
				
			
			OpenSim:master
					
						OpenSim:0.9.1.1
					
						OpenSim:0.9.1.0-post-fixes
					
						OpenSim:httptests
					
						OpenSim:0.9.0.1-postfixes
					
						OpenSim:BulletSim2017
					
						OpenSim:0.9.0-post-fixes
					
						OpenSim:melanie
					
						OpenSim:LSLKeyTest
					
						OpenSim:0.8.2-post-fixes
					
						OpenSim:avinationmerge
					
						OpenSim:0.8.1-post-fixes
					
						OpenSim:fsassets
					
						OpenSim:inv-download
					
						OpenSim:0.8.0.4
					
						OpenSim:0.7.6.3
					
						OpenSim:sedebug
					
						OpenSim:mb-throttle-test
					
						OpenSim:ghosts
					
						OpenSim:0.7.5-post-fixes
					
						OpenSim:0.8-extended
					
						OpenSim:0.7.6-post-fixes
					
						OpenSim:0.7.4-post-fixes
					
						OpenSim:0.8-post-fixes
					
						OpenSim:0.7.4.1
					
						OpenSim:0.7.6.2
					
						OpenSim:0.8.0.3
					
						OpenSim:bullet-2.82
					
						OpenSim:justincc-master
					
						OpenSim:0.7.6-extended
					
						OpenSim:varregion
					
						OpenSim:master-beforevarregion
					
						OpenSim:link-sitting
					
						OpenSim:TeleportWork
					
						OpenSim:cpu-performance
					
						OpenSim:user_profiles
					
						OpenSim:0.7.5-pf-bulletsim
					
						OpenSim:0.7.4-extended
					
						OpenSim:0.7.3-post-fixes
					
						OpenSim:integration
					
						OpenSim:0.7.3-extended
					
						OpenSim:connector_plugin
					
						OpenSim:iar_mods
					
						OpenSim:xassetservice
					
						OpenSim:0.7.2-post-fixes
					
						OpenSim:dsg
					
						OpenSim:remove-scene-viewer
					
						OpenSim:bulletsim
					
						OpenSim:0.7.1-dev
					
						OpenSim:0.7-post-fixes
					
						OpenSim:0.6.9-post-fixes
					
						OpenSim:viewer-2-initial-appearance
					
						OpenSim:0.7.0.1-post-fixes
					
						OpenSim:0.7.0.2-release
					
						OpenSim:prebuild-update
					
						OpenSim:soprefactor
					
						OpenSim:0.7.0.1-release
					
						OpenSim:0.7-release
					
						OpenSim:slimupdates2
					
						OpenSim:0.6.9
					
						OpenSim:slimupdates
					
						OpenSim:mysql-performance
					
						OpenSim:0.6.8-post-fixes
					
						OpenSim:0.6.7-post-fixes
					
						OpenSim:0.6.8-pre1
					
						OpenSim:prioritization
					
						OpenSim:arthursv
					
						OpenSim:0.6.6-post-fixes
					
						OpenSim:trunk
					
						OpenSim:0.6.5-post-fixes
					
						OpenSim:0.6.5-rc1
					
						OpenSim:GenericGridServerConcept
					
						OpenSim:0.6.4-post-fixes
					
						OpenSim:0.6.2-post-fixes
					
						OpenSim:0.6.4-rc1
					
						OpenSim:0.6.3-post-fixes
					
						OpenSim:0.6.1-post-fixes
					
						OpenSim:0.6.0-stable
					
						OpenSim:rexserver_r830
					
						OpenSim:0.6b-realxtend
					
						OpenSim:afrisby-3
					
						OpenSim:ThreadPoolClientBranch
					
						OpenSim:afrisby-rexmerge
					
						OpenSim:afrisby
					
						OpenSim:physics
					
						OpenSim:Sugilite
					
						OpenSim:OGSMerge
					
						OpenSim:zircon
					
						OpenSim:merge
					
						OpenSim:0.1-prestable
					
						OpenSim:scripting-jvm
					
						OpenSim:tourmaline
					
						OpenSim:physics-inventorytesting
					
						OpenSim:adam
					
						OpenSim:adam-ogscs
					
						OpenSim:ogs-cs
					
						OpenSim:ogs-cs@160
					
						OpenSim:ogs-cs@155
					
						OpenSim:ConvertToPlugins
					
						OpenSim:physicsExample
					
						OpenSim:ogs-cs@151
					
						OpenSim:brokenplugins
					
						OpenSim:ogs-cs@86
					
						OpenSim:standalone
					
					
					
					
				
				pull from: OpenSim:remove-scene-viewer
				
			
			OpenSim:master
					
						OpenSim:0.9.1.1
					
						OpenSim:0.9.1.0-post-fixes
					
						OpenSim:httptests
					
						OpenSim:0.9.0.1-postfixes
					
						OpenSim:BulletSim2017
					
						OpenSim:0.9.0-post-fixes
					
						OpenSim:melanie
					
						OpenSim:LSLKeyTest
					
						OpenSim:0.8.2-post-fixes
					
						OpenSim:avinationmerge
					
						OpenSim:0.8.1-post-fixes
					
						OpenSim:fsassets
					
						OpenSim:inv-download
					
						OpenSim:0.8.0.4
					
						OpenSim:0.7.6.3
					
						OpenSim:sedebug
					
						OpenSim:mb-throttle-test
					
						OpenSim:ghosts
					
						OpenSim:0.7.5-post-fixes
					
						OpenSim:0.8-extended
					
						OpenSim:0.7.6-post-fixes
					
						OpenSim:0.7.4-post-fixes
					
						OpenSim:0.8-post-fixes
					
						OpenSim:0.7.4.1
					
						OpenSim:0.7.6.2
					
						OpenSim:0.8.0.3
					
						OpenSim:bullet-2.82
					
						OpenSim:justincc-master
					
						OpenSim:0.7.6-extended
					
						OpenSim:varregion
					
						OpenSim:master-beforevarregion
					
						OpenSim:link-sitting
					
						OpenSim:TeleportWork
					
						OpenSim:cpu-performance
					
						OpenSim:user_profiles
					
						OpenSim:0.7.5-pf-bulletsim
					
						OpenSim:0.7.4-extended
					
						OpenSim:0.7.3-post-fixes
					
						OpenSim:integration
					
						OpenSim:0.7.3-extended
					
						OpenSim:connector_plugin
					
						OpenSim:iar_mods
					
						OpenSim:xassetservice
					
						OpenSim:0.7.2-post-fixes
					
						OpenSim:dsg
					
						OpenSim:remove-scene-viewer
					
						OpenSim:bulletsim
					
						OpenSim:0.7.1-dev
					
						OpenSim:0.7-post-fixes
					
						OpenSim:0.6.9-post-fixes
					
						OpenSim:viewer-2-initial-appearance
					
						OpenSim:0.7.0.1-post-fixes
					
						OpenSim:0.7.0.2-release
					
						OpenSim:prebuild-update
					
						OpenSim:soprefactor
					
						OpenSim:0.7.0.1-release
					
						OpenSim:0.7-release
					
						OpenSim:slimupdates2
					
						OpenSim:0.6.9
					
						OpenSim:slimupdates
					
						OpenSim:mysql-performance
					
						OpenSim:0.6.8-post-fixes
					
						OpenSim:0.6.7-post-fixes
					
						OpenSim:0.6.8-pre1
					
						OpenSim:prioritization
					
						OpenSim:arthursv
					
						OpenSim:0.6.6-post-fixes
					
						OpenSim:trunk
					
						OpenSim:0.6.5-post-fixes
					
						OpenSim:0.6.5-rc1
					
						OpenSim:GenericGridServerConcept
					
						OpenSim:0.6.4-post-fixes
					
						OpenSim:0.6.2-post-fixes
					
						OpenSim:0.6.4-rc1
					
						OpenSim:0.6.3-post-fixes
					
						OpenSim:0.6.1-post-fixes
					
						OpenSim:0.6.0-stable
					
						OpenSim:rexserver_r830
					
						OpenSim:0.6b-realxtend
					
						OpenSim:afrisby-3
					
						OpenSim:ThreadPoolClientBranch
					
						OpenSim:afrisby-rexmerge
					
						OpenSim:afrisby
					
						OpenSim:physics
					
						OpenSim:Sugilite
					
						OpenSim:OGSMerge
					
						OpenSim:zircon
					
						OpenSim:merge
					
						OpenSim:0.1-prestable
					
						OpenSim:scripting-jvm
					
						OpenSim:tourmaline
					
						OpenSim:physics-inventorytesting
					
						OpenSim:adam
					
						OpenSim:adam-ogscs
					
						OpenSim:ogs-cs
					
						OpenSim:ogs-cs@160
					
						OpenSim:ogs-cs@155
					
						OpenSim:ConvertToPlugins
					
						OpenSim:physicsExample
					
						OpenSim:ogs-cs@151
					
						OpenSim:brokenplugins
					
						OpenSim:ogs-cs@86
					
						OpenSim:standalone
					
					
					
					
				These branches are equal. There is no need to create a pull request.