ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-02 08:25:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
71012ef8836fe75b441d86b5a3ba2c3fa4014032
opensim/OpenSim/Framework
History
Melanie 1b600e7803 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-01-30 16:38:11 +00:00
..
AssetLoader/Filesystem
Changed asset CreatorID to a string
2010-02-22 14:18:59 -08:00
Client
Formatting cleanup.
2009-10-01 01:17:47 +09:00
Communications
Merge branch 'master' into careminster-presence-refactor
2010-12-03 02:36:13 +00:00
Configuration
Revert "remove long unused OpenSim/Framework/Configuration/* projects"
2010-08-04 01:10:01 +01:00
Console
Stop also adding an ordinary http handler when we set up a poll http handler.
2011-12-07 12:28:42 +00:00
RegionLoader
Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge
2011-10-11 23:01:52 +01:00
Serialization
HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
2012-01-12 09:56:35 -08:00
Servers
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
2011-12-08 03:24:25 +00:00
Statistics
Comment out asset statistics section from periodic stats as these have not been recorded for a very long time.
2012-01-24 22:14:21 +00:00
Tests
Merge branch 'master' into bigmerge
2011-12-05 17:10:51 +00:00
AgentCircuitData.cs
Commented a couple of verbose debug messages.
2011-12-16 17:23:30 -08: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
minor:comments
2009-08-12 23:34:12 -04:00
AssemblyInfo.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
AssetBase.cs
Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge
2011-10-11 22:51:44 +01:00
AssetLandmark.cs
HG Landmarks now working.
2011-06-03 10:26:58 -07:00
AssetRequestToClient.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
AuthenticateResponse.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
AvatarAppearance.cs
Merge branch 'master' into careminster
2011-12-19 21:30:57 +00:00
AvatarAttachment.cs
Stop NPCs losing attachments when the source avatar takes them off.
2011-09-03 01:11:16 +01:00
AvatarPickerAvatar.cs
minor:comments
2009-08-12 23:34:12 -04:00
AvatarPickerReplyAgentDataArgs.cs
minor:comments
2009-08-12 23:34:12 -04:00
AvatarPickerReplyDataArgs.cs
…
AvatarWearable.cs
Drop the static from default wearables. It isn't
2010-12-27 12:43:54 -08:00
AvatarWearingArgs.cs
…
BlockingQueue.cs
Formatting cleanup.
2009-10-19 08:58:03 +09:00
Cache.cs
Connect up the new asset cache and introduce an asynchronous call path
2009-05-10 14:03:06 +00:00
CapsUtil.cs
Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll
2011-04-30 11:03:22 -07:00
ChatTypeEnum.cs
…
ChildAgentDataUpdate.cs
Commented a couple of verbose debug messages.
2011-12-16 17:23:30 -08:00
ClientInfo.cs
One less [Serializable] -- ClientInfo.
2011-04-28 09:06:57 -07:00
ClientManager.cs
* Converts ClientManager.ForEach() (and as a result, Scene.ForEachClient()) to use a non-blocking parallel method when operating in async mode
2009-10-27 00:26:56 -07:00
CnmMemoryCache.cs
Formatting cleanup.
2009-10-01 01:17:47 +09:00
CnmSynchronizedCache.cs
Formatting cleanup.
2009-10-01 01:17:47 +09:00
ColliderData.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
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
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
Constants.cs
Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer.
2010-08-19 18:55:30 -07:00
Culture.cs
Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
2010-02-12 23:13:35 +00:00
EstateBan.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
EstateSettings.cs
Merge branch 'master' into careminster
2012-01-26 23:07:31 +00:00
EventData.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
ForeignUserProfileData.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
FriendListItem.cs
Change a member of the friendslist module to better reflect the client side
2010-01-19 11:33:42 +00:00
GridInstantMessage.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
GroupData.cs
replace recent IModule.GetGroup() with better GetGroupRecord(string name)
2010-03-26 00:10:29 +00:00
IAssetLoader.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
ICallingCardModule.cs
Update calling card interface
2010-12-07 04:45:28 +01:00
IClientAPI.cs
Merge branch 'master' into careminster
2012-01-21 19:52:33 +00:00
ICnmCache.cs
Formatting cleanup.
2009-10-01 01:17:47 +09:00
ICommandConsole.cs
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
2011-10-25 20:24:21 +01:00
IConsole.cs
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
2011-10-25 20:24:21 +01:00
IGenericConfig.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
IImprovedAssetCache.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
ILandChannel.cs
remove now unused individual LandData prim counts.
2011-04-05 21:25:54 +01:00
ILandObject.cs
llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParcelMusicURL
2012-01-25 15:48:38 -05:00
IMoneyModule.cs
Merge branch 'master' into careminster
2012-01-28 01:01:23 +00:00
InventoryCollection.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
InventoryFolderBase.cs
Formatting cleanup.
2009-10-01 01:17:47 +09: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
Initialize InventoryItemBase.creatorData properly. Could throw.
2010-11-23 06:36:57 -08:00
InventoryNodeBase.cs
Formatting cleanup.
2009-10-01 01:17:47 +09:00
IPlugin.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
IPrimCounts.cs
(re)implement selected prim count.
2011-03-30 00:13:07 +01:00
IRegionCreator.cs
…
IRegionLoader.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
IRegistryCore.cs
…
IScene.cs
Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
2011-12-09 23:07:53 +00:00
ISceneAgent.cs
Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
2011-12-09 23:07:53 +00: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
Merge branch 'master' into careminster-presence-refactor
2011-04-06 09:22:55 +01:00
LandStatReportItem.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
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
* Removing ODEPrim and ODECharacter GetHashCode() overrides since they were based on something that could change
2009-10-20 10:56:15 -07:00
LocklessQueue.cs
* Copied LocklessQueue.cs into OpenSim.Framework and added the .Count property and .Clear() method
2009-10-13 18:56:54 -07:00
Login.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
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
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
MapItemReplyStruct.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
MinHeap.cs
Add copyright header. Formatting cleanup.
2009-10-22 18:57:24 +09:00
MultipartForm.cs
Formatting cleanup. Add copyright notices.
2010-03-10 13:15:36 +09: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
OSChatMessage.cs
…
PacketPool.cs
In the packetpool, if we encounter a data block that somehow wasn't retrieved via GetDataBlock() then create a new stack instead of throwing an exception
2011-07-31 02:30:40 +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
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
Formatting cleanup. Ignore some generated files.
2009-06-09 18:07:35 +00:00
PrimitiveBaseShape.cs
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
PriorityQueue.cs
minor: remove mono compiler warnings
2011-05-06 22:45:03 +01:00
RegionHandshakeArgs.cs
…
RegionInfo.cs
Merge branch 'master' into careminster
2011-12-12 11:42:22 +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-01-30 16:38:11 +00:00
RegistryCore.cs
…
RequestAssetArgs.cs
…
SimStats.cs
Formatting cleanup.
2009-10-01 01:17:47 +09:00
SLUtil.cs
Fix notecards that end with an embedded object causing an exception
2010-12-17 22:50:00 +00:00
SurfaceTouchEventArgs.cs
…
TaskInventoryDictionary.cs
Pass the first name and last name from the agent circuit data to the authorization service rather than from the account.
2011-07-23 03:48:53 +01:00
TaskInventoryItem.cs
Merge branch 'master' into bigmerge
2011-11-28 11:06:38 +00:00
TextureRequestArgs.cs
* Patch from RemedyTomm Mantis 3440
2009-04-10 08:30:21 +00:00
ThrottleOutPacketType.cs
* Change the OnQueueEmpty signature to send the flags of the queues that are empty instead of firing once per empty queue
2009-10-21 18:03:41 -07:00
UntrustedWebRequest.cs
Formatting cleanup. Add copyright notices.
2010-03-10 13:15:36 +09:00
UpdateShapeArgs.cs
…
UserAgentData.cs
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
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
Util.cs
Merge branch 'master' into bigmerge
2011-12-09 08:13:57 +00:00
ViewerEffectEventHandlerArg.cs
…
Watchdog.cs
Merge branch 'master' into bigmerge
2011-11-17 19:04:27 +00:00
WebUtil.cs
Merge branch 'master' into bigmerge
2011-11-28 11:06:38 +00:00