ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-20 15:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
bef03fb30be67dbe671dcc330558daf8a6c4bb22
opensim/OpenSim/Framework
History
Melanie bef03fb30b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
2013-08-17 03:23:45 +01:00
..
AssetLoader/Filesystem
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
Client
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
Communications
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00:00
Configuration
Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.
2013-02-27 00:21:02 +00:00
Console
Merge branch 'master' into careminster
2013-08-07 23:29:42 +01:00
Monitoring
Merge branch 'master' into careminster
2013-08-17 03:23:45 +01:00
RegionLoader
Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.
2013-02-27 00:21:02 +00:00
Serialization
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
Servers
remove mono compiler warnings from PollServiceRequestManager
2013-08-17 00:56:19 +01:00
Tests
Merge branch 'master' into careminster
2013-08-11 17:31:25 +01:00
AgentCircuitData.cs
Extend "show circuits" to show circuit code, ip and viewer name.
2012-07-12 23:09:36 +01:00
AgentCircuitManager.cs
Improve locking in AgentCircuitManager
2011-12-03 16:19:11 +00:00
AgentUpdateArgs.cs
add an agent position field to AgentUpdateArgs for use by some non-LL clients
2010-01-14 02:16:40 -08:00
Animation.cs
Add TriggerScenePresenceUpdated events when an animation is added
2013-06-11 17:18:12 -07:00
AssemblyInfo.cs
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
AssetBase.cs
add assettype mesh to list of binary assets
2012-09-26 20:31:34 +01:00
AssetLandmark.cs
HG Landmarks now working.
2011-06-03 10:26:58 -07:00
AssetPermissions.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
AssetRequestToClient.cs
…
AuthenticateResponse.cs
…
AvatarAppearance.cs
This is an experimental patch that adds support for comparing texture
2013-05-24 13:18:16 -07:00
AvatarAttachment.cs
Stop NPCs losing attachments when the source avatar takes them off.
2011-09-03 01:11:16 +01:00
AvatarPickerAvatar.cs
…
AvatarPickerReplyAgentDataArgs.cs
…
AvatarPickerReplyDataArgs.cs
…
AvatarWearable.cs
revert last add commit
2012-04-26 18:24:36 +01:00
AvatarWearingArgs.cs
…
BlockingQueue.cs
Revert "Revert "I confuse myself. Let's try this variable name instead.""
2013-07-18 12:25:47 -07:00
Cache.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
CachedTextureEventArg.cs
Adds an event and a method so that handling of the CachedTexture
2013-05-08 13:13:51 -07:00
CapsUtil.cs
Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll
2011-04-30 11:03:22 -07:00
ChatTypeEnum.cs
…
ChildAgentDataUpdate.cs
Merge branch 'master' into careminster
2013-08-07 23:29:42 +01:00
ClientInfo.cs
Added show client-stats [first last] command to expose what viewers are requesting.
2013-07-10 16:09:45 -07:00
ClientManager.cs
…
CnmMemoryCache.cs
…
CnmSynchronizedCache.cs
…
ColliderData.cs
…
ConfigSettings.cs
move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
2011-10-15 03:03:05 +01:00
ConfigurationMember.cs
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
2011-10-25 20:24:21 +01:00
ConfigurationOption.cs
…
Constants.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
Culture.cs
Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
2010-02-12 23:13:35 +00:00
DAMap.cs
minor: remove now unused migration-hack bool from DAMap
2013-07-08 23:32:19 +01:00
DOMap.cs
Make the concept of namespaces explicit in dynamic attributes
2013-06-27 23:14:28 +01:00
DoubleDictionaryThreadAbortSafe.cs
Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the aim of avoiding OpenSimulator problems due to script thread aborts.
2012-12-07 00:47:04 +00:00
EstateBan.cs
…
EstateSettings.cs
Merge branch 'master' into careminster
2013-05-11 02:35:26 +01:00
EventData.cs
…
ExtraPhysicsData.cs
Partial port of Avination's support for the new physics parameters.
2013-02-06 08:03:04 +00:00
ForeignUserProfileData.cs
…
FriendListItem.cs
Change a member of the friendslist module to better reflect the client side
2010-01-19 11:33:42 +00:00
GcNotify.cs
If "debug scene updates true" then print out to log when a garbage collection occurs.
2012-03-21 02:02:14 +00:00
GridInstantMessage.cs
Several major improvements to group (V2) chat. Specifically: handle join/drop appropriately, invitechatboxes.
2013-07-27 15:38:56 -07:00
GroupData.cs
replace recent IModule.GetGroup() with better GetGroupRecord(string name)
2010-03-26 00:10:29 +00:00
IAssetLoader.cs
…
IClientAPI.cs
Merge branch 'master' into careminster
2013-07-24 04:45:07 +01:00
ICnmCache.cs
…
ICommandConsole.cs
factor out common HandleShow code for "show uptime"
2012-11-22 04:05:09 +00:00
IConsole.cs
factor out common HandleShow code for "show uptime"
2012-11-22 04:05:09 +00:00
IGenericConfig.cs
…
IImprovedAssetCache.cs
add a Check method to flotsamAssetCache, so to check if a asset is in
2012-12-13 02:55:36 +00:00
ILandChannel.cs
Add ILandChannel.GetLandObject(Vector3 position) as this is a very common input to GetLandObject()
2013-03-14 22:56:26 +00:00
ILandObject.cs
check land permitions on sit target for unscripted sits
2013-01-03 14:27:21 +00:00
IMoneyModule.cs
Add a result param to te money module interface
2013-06-13 02:52:11 +02:00
InventoryCollection.cs
…
InventoryFolderBase.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
InventoryFolderImpl.cs
Remove manually permissions settings on all current library items so that they use the defaults instead.
2011-07-23 02:13:11 +01:00
InventoryItemBase.cs
Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid
2012-11-17 01:23:29 +00:00
InventoryNodeBase.cs
…
IPeople.cs
Added AvatarPickerSearch capability handler.
2013-05-07 18:01:48 -07:00
IPlugin.cs
…
IPrimCounts.cs
(re)implement selected prim count.
2011-03-30 00:13:07 +01:00
IRegionCreator.cs
…
IRegionLoader.cs
…
IRegistryCore.cs
…
IScene.cs
On startup, start scenes after we're set up all local scenes, rather than starting scenes before others have been created.
2013-05-03 18:48:50 +01:00
ISceneAgent.cs
OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather than scanning all scene for the presence with the right id
2012-06-12 02:43:33 +01:00
ISceneEntity.cs
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
2011-12-17 02:23:24 +00:00
ISceneObject.cs
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
2011-12-17 02:23:24 +00:00
LandData.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
LandStatReportItem.cs
…
LandUpdateArgs.cs
Formatting cleanup.
2010-09-12 13:43:49 -04:00
Lazy.cs
Add copyright headers.
2010-09-12 12:54:31 -04:00
Location.cs
* Thanks Plugh for pointing out that the constructor that takes a ulong regionhandle and saves it to to X,Y vars in the OpenSim.Framework.Location object was inverting the X and Y resulting in X and Y confusion. The test also used 256x256 in the uint,uint constructor so it was unable to determine if the X and Y components swapped. I don't expect much upheaval from this commit, not a lot of features were using the ulong Location object constructor. The database never stores the ulong regionhandle... the prims are loaded by region Guid. LLUDPServer used it to determine regions that it handled in a service definition where there was simply a X == X test which has the same logical result un-switched as it did switched. Again, thanks LibOMV for the regionhandle code.
2013-08-01 16:32:36 -05:00
LocklessQueue.cs
Add a way to put things at the front of the queue for any throttle group.
2013-01-16 19:29:27 +01:00
Login.cs
…
MainConsole.cs
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
2011-10-25 20:24:21 +01:00
MapAndArray.cs
Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurliman
2010-09-18 01:57:13 +01:00
MapBlockData.cs
…
MapItemReplyStruct.cs
…
MinHeap.cs
Commiting Avination's memleak fix-a-thon, installment #1
2012-07-23 19:21:59 +01:00
MultipartForm.cs
Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().
2012-03-12 10:07:04 -07:00
NetworkServersInfo.cs
Get rid of some traces of the old pre-ROBUST grid architecture config
2011-10-12 21:51:34 +01:00
NetworkUtil.cs
Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
2010-08-19 19:54:40 -07:00
ObjectChangeData.cs
Refactor, move OjectChangeData into it's own file and rename
2012-03-13 13:08:32 +01:00
OSChatMessage.cs
Revert "Mantis 5977 Corrections to llRegionSayTo"
2012-06-28 22:02:20 +01:00
ParcelMediaCommandEnum.cs
ANother stab at LSL compatibility
2010-07-01 17:06:29 +02:00
PluginLoader.cs
When clearing the addin registry, respect a custom path
2010-09-24 22:00:51 +02:00
PluginManager.cs
minor: Remove some mono compiler warnings in OpenSim.Framework.dll
2013-03-13 23:17:27 +00:00
Pool.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
PresenceType.cs
Don't try to save changed attachment states when an NPC with attachments is removed from the scene.
2011-08-18 00:53:05 +01:00
PrimeNumberHelper.cs
…
PrimitiveBaseShape.cs
Merge branch 'master' into careminster
2013-02-10 00:17:14 +00:00
PriorityQueue.cs
fix priorityQueue to correctly use the fairness counts starting at 8 for
2012-09-26 00:17:54 +01:00
RegionFlags.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
RegionHandshakeArgs.cs
…
RegionInfo.cs
Merge branch 'master' into careminster
2013-01-31 20:16:45 +00:00
RegionInfoForEstateMenuArgs.cs
Plumb the region type through to the ProductName field in estate messages
2010-08-24 12:41:21 +01:00
RegionSettings.cs
Merge branch 'master' into careminster
2012-05-14 23:32:49 +01:00
RegistryCore.cs
…
RequestAssetArgs.cs
…
SimStats.cs
…
SLUtil.cs
Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.
2012-04-26 22:49:14 +01:00
SurfaceTouchEventArgs.cs
…
TaskInventoryDictionary.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
TaskInventoryItem.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
TextureRequestArgs.cs
…
ThrottleOutPacketType.cs
Add a way to put things at the front of the queue for any throttle group.
2013-01-16 19:29:27 +01:00
UntrustedWebRequest.cs
Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."
2012-09-30 07:48:03 -07:00
UpdateShapeArgs.cs
…
UserAgentData.cs
…
UserProfileData.cs
Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
2009-12-06 03:57:15 +00:00
UserProfiles.cs
Adding standard OpenSim header to source files
2013-05-31 22:03:27 -04:00
Util.cs
Merge branch 'master' into careminster
2013-08-11 17:31:25 +01:00
ViewerEffectEventHandlerArg.cs
…
WearableCacheItem.cs
* This finishes the implementation of AgentCachedTexture. Requires the XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
2012-12-29 08:53:58 -05:00
WebUtil.cs
Merge branch 'master' into careminster
2013-08-07 23:29:42 +01:00