Commit Graph

20327 Commits (bb0f2f98e85a7da758e2de458c3d28e13ce2f1d6)

Author SHA1 Message Date
Diva Canto 06dba1fa62 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-07-02 16:47:17 -07:00
Diva Canto 4d24bf75fd Deleted debug messages. Fixed a null ref exception on the POST handler of GridUserServerPostHandler.cs 2013-07-02 16:46:35 -07:00
Justin Clark-Casey (justincc) d01b8e163d minor: Correct typo of "Descrition" to "Description" in "show object *" console commands
Thanks to Ai Austin for pointing this out.
2013-07-03 00:27:22 +01:00
Diva Canto 316e8f9239 Fix SQL statement 2013-07-02 16:10:09 -07:00
Diva Canto 9725b829d5 Do the same for SQLite and MSSQL 2013-07-02 15:48:30 -07:00
Diva Canto 2c05caec7f Really make it call the method with the query interface 2013-07-02 15:47:02 -07:00
Diva Canto 626940ceb8 More debug messages 2013-07-02 15:39:10 -07:00
Diva Canto e984bfb4c6 This should have a strong effect on the Unknown User issue mantis #6625 2013-07-02 14:31:39 -07:00
Diva Canto ccca005969 HG: close a loophole by which if something was wrong with the ServiceURLs it resulted in never ending asset requests 2013-07-02 13:29:44 -07:00
Justin Clark-Casey (justincc) 635704b7ef Update debug unknown user name UserUMMTGUN3 to UserUMMTGUN4 and UserUMMAU -> UserUMMAU2 to track any new occurences.
This is to see the impact that Diva's fixes related to this issue (last one is currently commit c7383688)
You will need to clear your viewer cache for this to have any effect
Relates to http://opensimulator.org/mantis/view.php?id=6625
2013-07-01 23:54:04 +01:00
Robert Adams 8eb86c9ec9 BulletSim: add the reset of the last commit for flush log file problems.
Fix small typo in one log message.
2013-06-30 19:22:43 -07:00
Robert Adams c24c99f4ba BulletSim: fix an occasional crash with flushing log files. 2013-06-30 19:08:15 -07:00
Robert Adams 9d5ae75950 BulletSim: remove the handle to the vehicle actor and cause routines
that need it to look it up.
2013-06-30 17:07:51 -07:00
Robert Adams 425d2a2a97 BulletSim: set linkset type to be prim specific rather than a simulator
wide default. This allows individual prims to differ in the
underlying linkset implementation.
2013-06-30 17:07:50 -07:00
Robert Adams 23516717e4 BulletSim: a better version of llMoveToTarget that doesn't go crazy.
There is still some overshoot but mostly fixes Mantis 6693.
Fix bug where moveToTarget was active for non-physical objects
and while selected.
Fix bug where move target was not getting changed if the script
changed the target during a move.
2013-06-30 17:07:49 -07:00
Robert Adams 2f4a729d40 BulletSim: add inTaintTime parameter to collision cache clear function. 2013-06-30 17:07:48 -07:00
Diva Canto e377abcc35 Groups V2: charge for group creation only after the group has been successfully created 2013-06-30 08:39:35 -07:00
Diva Canto c738368846 Revert "More debug mantis #6625"
This reverts commit 20f2cf8769.
2013-06-30 07:25:46 -07:00
Diva Canto 1e97972f78 Revert "One more debug mantis #6625"
This reverts commit 8fa5d12fcb.

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2013-06-30 07:25:13 -07:00
Diva Canto 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
Diva Canto 1fc873d09f Same fix to LocalInventoryServiceConnector.cs 2013-06-30 07:21:22 -07:00
Diva Canto 74e7fac13f More on mantis #6625 2013-06-29 22:32:26 -07:00
Diva Canto 20f2cf8769 More debug mantis #6625 2013-06-29 21:54:10 -07:00
Diva Canto c462e0a51c Fixed previous debug message 2013-06-29 21:30:07 -07:00
Diva Canto 8fa5d12fcb One more debug mantis #6625 2013-06-29 21:26:58 -07:00
Diva Canto 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
Diva Canto ff47cf77ab A little more debug for the Unknown User problem mantis #6625 2013-06-29 19:15:25 -07:00
Diva Canto 00093a305d Changed HG status notifications timeout down to 15secs from the default 100. 2013-06-29 18:35:23 -07:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 371085546d Add materials store null check into UuidGatherer code. 2013-06-28 23:57:41 +01:00
Justin Clark-Casey (justincc) eed15703ed Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-06-28 23:35:44 +01:00
Justin Clark-Casey (justincc) 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
dahlia 4cb4c9fb25 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-06-28 14:03:46 -07:00
dahlia cbb5122729 add some locking to materials storage dictionary 2013-06-28 14:00:28 -07:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
dahlia 529633d970 add method docs for DAMap.GetStore() and DAMap.SetStore() 2013-06-27 18:44:27 -07:00
dahlia d47fc48b32 and yet another check for null returned from DynAttrs.GetStore() 2013-06-27 18:01:17 -07:00
dahlia c1b8f83dd4 test for null return from DynAttrs.GetStore() 2013-06-27 17:53:15 -07:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 4b00203fa5 Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 structs 2013-06-25 00:15:55 +01:00
Melanie 936700bda3 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-06-23 01:49:45 +01:00
Melanie 4bf1afe300 Fix prim locking to behave like SL 2013-06-23 01:34:35 +01:00
Diva Canto edb11a7eca Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-06-22 08:29:54 -07:00
Diva Canto 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
Diva Canto ca3ce6da73 HG: avoid call on localhost between sim and UAS for standalone. 2013-06-22 08:26:59 -07:00