OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
24,958 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

24958 Commits (e5f9f064a706d6be40e3da075f89b170aeb0ee1d)

Author SHA1 Message Date
Melanie a022ee5766 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
 2013-06-11 01:03:15 +01:00
teravus 1c7fbb86c2 Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669 2013-06-10 18:47:08 -05:00
dahlia a949556c4e add a Normalize() method for LSL_Rotation 2013-06-10 16:42:49 -07:00
Justin Clark-Casey (justincc) 7af97f88b7 Add port numbers to poll service thread names so that we can tell which belong to which HttpServer 2013-06-10 23:39:17 +01:00
Justin Clark-Casey (justincc) 32d1e50565 Reinstate explicit starting and stopping of PollServiceRequestManager added in 3eee991 but removed in 7c0bfca 
Do not rely on destructors to stop things.
These fire at unpredictable times and cause problems such as http://opensimulator.org/mantis/view.php?id=6503
and most probably http://opensimulator.org/mantis/view.php?id=6668
 2013-06-10 23:30:35 +01:00
Mic Bowman a2f1cd87f8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-06-10 15:15:38 -07:00
Mic Bowman 82e3b9a6e0 Fix test for adding temporary assets. Code for non-local temporary assets 
is there but commented out.
 2013-06-10 15:14:55 -07:00
Robert Adams 795acaa6aa BulletSim: add failure flag for meshing failure vs asset fetch failure 
so error messages make more sense.
Change some BulletSim status log messages from WARN to INFO.
Update TODO list.
 2013-06-10 14:12:45 -07:00
Mic Bowman 57141e34bf Remove Temporary from use to shortcut asset stores. The Local property 
differentiates between local & grid storage. The Temporary property just
says that which service handles the it, the asset can be safely removed
in the future.
 2013-06-10 13:26:19 -07:00
Talun 7de0912a97 Mantis 5346: llAxisAngle2Rot() should normalize before computing 
Corrected to agree with
http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes
to normalise the vector before computing the quaternion

Signed-off-by: dahlia <dahlia@nomail>
 2013-06-10 04:13:34 -07:00
Diva Canto e741e5ebce More on mantis #6666 -- Groups V2 remote connector. 2013-06-09 20:20:37 -07:00
Melanie 745a209bf2 Explicitly set uploaded mesh object perms 2013-06-10 01:16:22 +02:00
UbitUmarov 925a8d47eb Merge branch 'avination-current' into ubitwork 2013-06-08 19:19:51 +01:00
UbitUmarov 244f6fa5cd Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 2013-06-08 19:18:47 +01:00
Diva Canto 4e2e69bd25 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-06-08 11:01:20 -07:00
Diva Canto d00770d56b Groups V2 -- fix mantis #6666 2013-06-08 11:00:22 -07:00
BlueWall 75e4af9d39 Catch exception triggered by incoming avatars using legacy profiles 2013-06-08 11:00:05 -04:00
Melanie 8582b2b992 Make objects attached from the ground appear in inventory again. Fixes a number 
of interaction issues causing client crashes.
 2013-06-08 02:32:05 +02:00
BlueWall 34d40e46a5 Merge branch 'profiles' 
message to explain why this merge is necessary,
 2013-06-07 20:17:45 -04:00
BlueWall 1cb1245d84 SQLite support for UserProfiles 2013-06-07 20:14:39 -04:00
BlueWall 1387224821 Ensure selected module is the only active one 2013-06-07 20:09:10 -04:00
Diva Canto 6aa54a8e16 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-06-07 16:01:07 -07:00
Melanie cf4d291443 Merge branch 'master' into careminster 2013-06-08 00:00:39 +01:00
Melanie 43cc38dfe1 Merge commit '75631e0267dbf58253dfcf6327b4d65f35bbaa6d' into careminster 2013-06-08 00:00:33 +01:00
Diva Canto 07cc16ff9c Put the configuration back in FetchInventoryDesc2 cap. 2013-06-07 16:00:32 -07:00
Melanie 3a722ef81b Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-06-07 23:59:02 +01:00
Melanie 75631e0267 Supply proper type information for the various types of requests 2013-06-07 23:55:03 +01:00
Melanie 7c0bfca7a0 Adding Avination's PollService to round out the HTTP inventory changes 2013-06-07 23:43:45 +01:00
Justin Clark-Casey (justincc) 454499ff60 minor: Comment out debug logging (at warn level) about number of objects force selected and turn down to debug level 2013-06-07 23:38:23 +01:00
UbitUmarov ed7fe6239c add indexes for new visual parameters shape_hover and 
APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for
now
 2013-06-07 23:18:48 +01:00
Melanie 45e333652c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
 2013-06-07 23:09:53 +01:00
Melanie 17a902fed4 Clean up poll service 2013-06-07 22:39:27 +02:00
Justin Clark-Casey (justincc) 346eda27cc minor: add dr0berts to contributors list 2013-06-07 19:26:09 +01:00
Justin Clark-Casey (justincc) f2a4d9b99c Fix regression where multiple close agents could be sent to the wrong neighbour region on root agent close. 
This was introduced in git master d214e2d0 (Thu May 16 17:12:02 2013)
Caught out by the fact that value types used in iterators act like references and this was dispatched asynchronously.
Should address http://opensimulator.org/mantis/view.php?id=6658
 2013-06-07 19:13:24 +01:00
Justin Clark-Casey (justincc) a74e65200c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-06-07 19:12:55 +01:00
Donnie Roberts 045c26f626 In LocalFriendshipTerminated, send the original client's agentId to the friend being removed instead of the friend's own id. 2013-06-07 18:43:00 +01:00
Diva Canto 664c6191ed Mantis #6620 (removed debug message) 2013-06-07 08:37:18 -07:00
Melanie dd7404d850 Merge branch 'master' into careminster 2013-06-06 23:50:03 +01:00
Melanie ac9c37f31b Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-06-06 23:49:34 +01:00
Melanie 06012f8675 Fix keyframe motion copyright 2013-06-06 23:49:02 +01:00
UbitUmarov c173c2eed5 try to suspend and resume keyframes on copy to inventory to take copy 
doesn't destroy state
 2013-06-06 19:21:21 +01:00
UbitUmarov 8bfd5c8927 Merge branch 'avination-current' into ubitwork 2013-06-06 19:03:32 +01:00
UbitUmarov 18e4496d2d keyframe: add more locks, change timming stop, added Suspend and resume 2013-06-06 18:57:32 +01:00
Diva Canto 25fa647a74 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-06-05 20:20:22 -07:00
Diva Canto 2ebf70d719 Strengthen some assumptions. 2013-06-05 20:19:59 -07:00
Melanie fe4a67efb6 Merge branch 'avination-current' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
	OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
	OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
 2013-06-06 03:20:15 +01:00
Melanie 11b348f73d Merge branch 'master' into careminster 2013-06-06 03:18:19 +01:00
Melanie a3210d1cf8 Database persistence for keyframes. Contains a Migration. 2013-06-06 03:17:38 +01:00
Melanie f7835b83d0 Merge branch 'master' into careminster 2013-06-06 03:05:00 +01:00
Melanie ea9e1d1a1e Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster 2013-06-06 03:04:47 +01:00