d7775d1e11 
								
							
								 
							
						 
						
							
							
								
								Revert "A little more debug for the Unknown User problem mantis #6625"  
							
							... 
							
							
							
							This reverts commit ff47cf77ab 
							
						 
						
							2013-06-30 07:22:27 -07:00  
				
					
						
							
							
								 
						
							
							
								1fc873d09f 
								
							
								 
							
						 
						
							
							
								
								Same fix to LocalInventoryServiceConnector.cs  
							
							
							
						 
						
							2013-06-30 07:21:22 -07:00  
				
					
						
							
							
								 
						
							
							
								74e7fac13f 
								
							
								 
							
						 
						
							
							
								
								More on mantis  #6625  
							
							
							
						 
						
							2013-06-29 22:32:26 -07:00  
				
					
						
							
							
								 
						
							
							
								20f2cf8769 
								
							
								 
							
						 
						
							
							
								
								More debug mantis  #6625  
							
							
							
						 
						
							2013-06-29 21:54:10 -07:00  
				
					
						
							
							
								 
						
							
							
								c462e0a51c 
								
							
								 
							
						 
						
							
							
								
								Fixed previous debug message  
							
							
							
						 
						
							2013-06-29 21:30:07 -07:00  
				
					
						
							
							
								 
						
							
							
								8fa5d12fcb 
								
							
								 
							
						 
						
							
							
								
								One more debug mantis  #6625  
							
							
							
						 
						
							2013-06-29 21:26:58 -07:00  
				
					
						
							
							
								 
						
							
							
								0c97021565 
								
							
								 
							
						 
						
							
							
								
								More debug for mantis  #6625 . It looks like the home friends list is being fetched on HG TPs.  
							
							
							
						 
						
							2013-06-29 21:05:45 -07:00  
				
					
						
							
							
								 
						
							
							
								ff47cf77ab 
								
							
								 
							
						 
						
							
							
								
								A little more debug for the Unknown User problem mantis  #6625  
							
							
							
						 
						
							2013-06-29 19:15:25 -07:00  
				
					
						
							
							
								 
						
							
							
								00093a305d 
								
							
								 
							
						 
						
							
							
								
								Changed HG status notifications timeout down to 15secs from the default 100.  
							
							
							
						 
						
							2013-06-29 18:35:23 -07:00  
				
					
						
							
							
								 
						
							
							
								3a634c56e3 
								
							
								 
							
						 
						
							
							
								
								Remove hack to migrate previous experimental-level os materials data.  
							
							... 
							
							
							
							This didn't seem to be working anyway and it's better not to have such hacks in the code for experimental stuff. 
							
						 
						
							2013-06-29 00:23:41 +01:00  
				
					
						
							
							
								 
						
							
							
								371085546d 
								
							
								 
							
						 
						
							
							
								
								Add materials store null check into UuidGatherer code.  
							
							
							
						 
						
							2013-06-28 23:57:41 +01:00  
				
					
						
							
							
								 
						
							
							
								eed15703ed 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-06-28 23:35:44 +01:00  
				
					
						
							
							
								 
						
							
							
								4406f07a84 
								
							
								 
							
						 
						
							
							
								
								Add IMG_BLOOM1.jp2 to standard asset set, which is used in stars.  
							
							... 
							
							
							
							This makes stars appear more realistically rather than as massive chunks due to the missing IMG_BLOOM1 asset from the viewer.
Thanks to YoshikoFazuku for supplying the star asset which I then uploaded via a viewer and extracted as JPEG2000.
Thanks also to Ai Austin for helping this process along.
See http://opensimulator.org/mantis/view.php?id=6691  for more details. 
							
						 
						
							2013-06-28 23:34:16 +01:00  
				
					
						
							
							
								 
						
							
							
								4cb4c9fb25 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-06-28 14:03:46 -07:00  
				
					
						
							
							
								 
						
							
							
								cbb5122729 
								
							
								 
							
						 
						
							
							
								
								add some locking to materials storage dictionary  
							
							
							
						 
						
							2013-06-28 14:00:28 -07:00  
				
					
						
							
							
								 
						
							
							
								e26e8b8829 
								
							
								 
							
						 
						
							
							
								
								Remove "Asset deletion not supported by database" message from "delete asset" robust/standalone console command since it actually was implemented and performed.  
							
							... 
							
							
							
							Improve other associated messages. 
							
						 
						
							2013-06-28 19:19:38 +01:00  
				
					
						
							
							
								 
						
							
							
								dc0455e217 
								
							
								 
							
						 
						
							
							
								
								In XAssetService, on a delete asset request also delete the asset in any chained service.  
							
							... 
							
							
							
							This eliminates the async migration since it causes a race condition with the "delete asset" console command 
							
						 
						
							2013-06-28 19:11:44 +01:00  
				
					
						
							
							
								 
						
							
							
								f6ce87c96d 
								
							
								 
							
						 
						
							
							
								
								Reinsert code for gathering uuids reference by materials back directly into UuidGatherer for now.  
							
							... 
							
							
							
							This cannot be triggered as an event from Scene.EventManager since some invocations of UuidGatherer (e.g. IAR saving) use scene objects which are not in scenes.
There needs to be some way for modules to register for events which are not connected with a particular scene. 
							
						 
						
							2013-06-28 18:50:33 +01:00  
				
					
						
							
							
								 
						
							
							
								529633d970 
								
							
								 
							
						 
						
							
							
								
								add method docs for DAMap.GetStore() and DAMap.SetStore()  
							
							
							
						 
						
							2013-06-27 18:44:27 -07:00  
				
					
						
							
							
								 
						
							
							
								d47fc48b32 
								
							
								 
							
						 
						
							
							
								
								and yet another check for null returned from DynAttrs.GetStore()  
							
							
							
						 
						
							2013-06-27 18:01:17 -07:00  
				
					
						
							
							
								 
						
							
							
								c1b8f83dd4 
								
							
								 
							
						 
						
							
							
								
								test for null return from DynAttrs.GetStore()  
							
							
							
						 
						
							2013-06-27 17:53:15 -07:00  
				
					
						
							
							
								 
						
							
							
								149487ea0f 
								
							
								 
							
						 
						
							
							
								
								refactor: Move code for gathering textures referenced by materials into MaterialsDemoModule from UuidGatherer  
							
							... 
							
							
							
							This code is now triggered via EventManager.OnGatherUuids which modules can subscribe to. 
							
						 
						
							2013-06-27 23:42:35 +01:00  
				
					
						
							
							
								 
						
							
							
								f7d09b898a 
								
							
								 
							
						 
						
							
							
								
								Make the concept of namespaces explicit in dynamic attributes  
							
							... 
							
							
							
							This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc.
All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace.
This does alter the underlying dynattrs data structure.  All data in previous structures may not be available, though old structures should not cause errors.
This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release.
However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace. 
							
						 
						
							2013-06-27 23:14:28 +01:00  
				
					
						
							
							
								 
						
							
							
								f78d2ef166 
								
							
								 
							
						 
						
							
							
								
								Update temporary "Unknown UserUMMTGUN2" name to "Unknown UserUMMTGUN3" to see if Diva's recent HG updates (post  6c7e33f) fix this issue.  
							
							... 
							
							
							
							This string is returned if a UserManagementModule.TryGetUserNames() cannot find a server-side name binding or a user account for a given UUID.
This is only called when the viewer requests a binding via the UDP UUIDNameRequest message 
							
						 
						
							2013-06-25 00:46:15 +01:00  
				
					
						
							
							
								 
						
							
							
								ce9b1320d2 
								
							
								 
							
						 
						
							
							
								
								Improve situation where editing just the root prim of an attachment causes other prims to be set to very far off positions on reattach.  
							
							... 
							
							
							
							Functionally the same as the patch by tglion in http://opensimulator.org/mantis/view.php?id=5334 
However, not yet perfect - after editing just root prim on reattach the position is still wrong, though other prims are not set to far off positions. 
							
						 
						
							2013-06-25 00:41:46 +01:00  
				
					
						
							
							
								 
						
							
							
								4b00203fa5 
								
							
								 
							
						 
						
							
							
								
								Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 structs  
							
							
							
						 
						
							2013-06-25 00:15:55 +01:00  
				
					
						
							
							
								 
						
							
							
								f70357eaa3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs 
							
						 
						
							2013-06-23 01:59:57 +01:00  
				
					
						
							
							
								 
						
							
							
								936700bda3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim  
							
							
							
						 
						
							2013-06-23 01:49:45 +01:00  
				
					
						
							
							
								 
						
							
							
								24a4367fc2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'avination-current' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs 
							
						 
						
							2013-06-23 01:48:57 +01:00  
				
					
						
							
							
								 
						
							
							
								25ed1658ca 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2013-06-23 01:35:09 +01:00  
				
					
						
							
							
								 
						
							
							
								4bf1afe300 
								
							
								 
							
						 
						
							
							
								
								Fix prim locking to behave like SL  
							
							
							
						 
						
							2013-06-23 01:34:35 +01:00  
				
					
						
							
							
								 
						
							
							
								8e9d6c6c56 
								
							
								 
							
						 
						
							
							
								
								Fix prim locking to behave like SL  
							
							
							
						 
						
							2013-06-23 01:14:07 +02:00  
				
					
						
							
							
								 
						
							
							
								edb11a7eca 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-06-22 08:29:54 -07:00  
				
					
						
							
							
								 
						
							
							
								6c7e33fe47 
								
							
								 
							
						 
						
							
							
								
								Change IsLocalRegion from using region handle to using regionID. This was affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.  
							
							
							
						 
						
							2013-06-22 08:29:06 -07:00  
				
					
						
							
							
								 
						
							
							
								ca3ce6da73 
								
							
								 
							
						 
						
							
							
								
								HG: avoid call on localhost between sim and UAS for standalone.  
							
							
							
						 
						
							2013-06-22 08:26:59 -07:00  
				
					
						
							
							
								 
						
							
							
								4778d67005 
								
							
								 
							
						 
						
							
							
								
								Finally moved HG agent transfers to use agent fatpacks.  
							
							
							
						 
						
							2013-06-21 20:52:46 -07:00  
				
					
						
							
							
								 
						
							
							
								74539659f6 
								
							
								 
							
						 
						
							
							
								
								BulletSim: move new linear deflection code to own routine.  
							
							... 
							
							
							
							Remove VehicleForwardVelocity changed storage since the value
will be modified as movement is processed. 
							
						 
						
							2013-06-21 10:46:21 -07:00  
				
					
						
							
							
								 
						
							
							
								a5de4f692b 
								
							
								 
							
						 
						
							
							
								
								BulletSim: Implementation of Linear Deflection, it is a partial help for the vehicle tuning diffrence between Opensim and Second life.  
							
							... 
							
							
							
							Signed-off-by: Robert Adams <Robert.Adams@intel.com> 
							
						 
						
							2013-06-20 19:02:15 -07:00  
				
					
						
							
							
								 
						
							
							
								bbeff4b8ca 
								
							
								 
							
						 
						
							
							
								
								BulletSim: rework velocity updating when not colliding and not flying  
							
							... 
							
							
							
							to prevent infinite jumps. Now jumps last only AvatarJumpFrames long
(default 4) which is about as high as in SL.
TODO: jumping should only depend on standing (collision with feet)
rather than collision anywhere on the avatar. 
							
						 
						
							2013-06-20 09:55:40 -07:00  
				
					
						
							
							
								 
						
							
							
								a33b6eed6d 
								
							
								 
							
						 
						
							
							
								
								minor: remove mono compiler warnings in WebsocketServerHandler.cs  
							
							
							
						 
						
							2013-06-20 00:54:19 +01:00  
				
					
						
							
							
								 
						
							
							
								085a87060a 
								
							
								 
							
						 
						
							
							
								
								Change "ObjectMemory" stat to "HeapMemory" to align with other stat names.  Also round this and ProcessMemory to three decimal places in common with other memory stats.  
							
							... 
							
							
							
							I believe leaving out such minor info makes stats easier to read 
							
						 
						
							2013-06-20 00:52:39 +01:00  
				
					
						
							
							
								 
						
							
							
								05790ba1cf 
								
							
								 
							
						 
						
							
							
								
								Allow more than one stat category to be specified in "show stats"  
							
							... 
							
							
							
							e.g. "show stats httpserver.9000 server.network" 
							
						 
						
							2013-06-20 00:45:56 +01:00  
				
					
						
							
							
								 
						
							
							
								5b1a9f84fd 
								
							
								 
							
						 
						
							
							
								
								minor: Change "memory churn" terminology in statistics to "heap allocation rate" since this is more generally meaningful  
							
							
							
						 
						
							2013-06-20 00:32:12 +01:00  
				
					
						
							
							
								 
						
							
							
								d97333255d 
								
							
								 
							
						 
						
							
							
								
								Fix minor bug where the check whether to display SmartThreadPool stats was accidentally != null rather than == FireAndForgetMethod.SmartThreadPool  
							
							... 
							
							
							
							Due to another check this had no practical effect 
							
						 
						
							2013-06-20 00:22:44 +01:00  
				
					
						
							
							
								 
						
							
							
								3370e19205 
								
							
								 
							
						 
						
							
							
								
								minor: fix mono compiler warning in FetchInventory2Handler  
							
							
							
						 
						
							2013-06-20 00:17:20 +01:00  
				
					
						
							
							
								 
						
							
							
								086fd70a5f 
								
							
								 
							
						 
						
							
							
								
								Make it possible to specify display of stats in a particular 'container' by separating category and container with a period.  
							
							... 
							
							
							
							e.g. "show stats server.network"
I failed to realize this had already been implemented without the period in the show stats command (as the command help had not been updated).
However, I would prefer the . approach as it will allow specifying multiple stats, easier wildcarding, etc.
This commit also prevents any stat from having a period in its short name. 
							
						 
						
							2013-06-20 00:00:39 +01:00  
				
					
						
							
							
								 
						
							
							
								84af1cab9b 
								
							
								 
							
						 
						
							
							
								
								Display existing statistic of how many http requests a server is making as server.network.HTTPRequestsMade in "show stats all"  
							
							
							
						 
						
							2013-06-19 20:48:12 +01:00  
				
					
						
							
							
								 
						
							
							
								8a86e29579 
								
							
								 
							
						 
						
							
							
								
								Mantis 6608: Math error in parcel dimensions/borders seen with land show command  
							
							... 
							
							
							
							This patch changes the land show console command to return numbers in the
range 4 to 256 for the "to" coordinates instead of 0 to 252
Also trailing spaces removed from some lines. 
							
						 
						
							2013-06-19 00:26:23 +01:00  
				
					
						
							
							
								 
						
							
							
								1a72f62d7b 
								
							
								 
							
						 
						
							
							
								
								minor: remove mono compiler warning in OfflineIMService  
							
							
							
						 
						
							2013-06-18 23:52:15 +01:00  
				
					
						
							
							
								 
						
							
							
								3fe5e9057f 
								
							
								 
							
						 
						
							
							
								
								Prevent an exception if no offline messages were retrieved.  
							
							
							
						 
						
							2013-06-18 23:15:38 +01:00