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

14572 Commits (e18a76f6d6456f80fe1a3d42923f900f3fa12028)

Author SHA1 Message Date
Melanie e18a76f6d6 Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmerge 2011-10-12 07:05:57 +01:00
Melanie 00285082d8 Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge 2011-10-12 07:05:47 +01:00
Melanie abfb0c9399 Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge 2011-10-12 07:05:18 +01:00
Melanie b251423b11 Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge 2011-10-12 07:04:28 +01:00
Melanie 86e28724bd Merge commit '95910f03d454e678a04ae7e800a445ba609b6003' into bigmerge 2011-10-12 07:03:58 +01:00
Melanie 265e9d094d Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge 2011-10-12 07:02:36 +01:00
Melanie b2090e711f Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-12 07:02:15 +01:00
Melanie f4de1a6d9b HACK: Remove advanced property resending until it is fixed properly in core. 2011-10-12 06:48:40 +02:00
Melanie 9733b64dc8 Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-12 02:02:46 +01:00
Melanie ba978d0d77 Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmerge 2011-10-12 01:43:52 +01:00
Melanie 4e88fe42e4 Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge 2011-10-12 01:42:39 +01:00
Melanie 5f2cb7caa3 Merge commit '7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7' into bigmerge 2011-10-12 01:42:30 +01:00
Melanie 77f9d98831 Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge 2011-10-12 01:41:59 +01:00
Melanie d595f9fd85 Merge commit '604708fc969b92af4f07d4acae9f3d15c7cee63e' into bigmerge 2011-10-12 01:41:52 +01:00
Melanie b0ee174296 Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmerge 2011-10-12 01:41:44 +01:00
Melanie e68226afd3 Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge 2011-10-12 01:41:28 +01:00
Melanie c0555f6be6 Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmerge 2011-10-12 01:39:38 +01:00
Melanie f5e78ca616 Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmerge 
Conflicts:
	OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
 2011-10-12 01:31:34 +01:00
Melanie 6af388ded9 Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge 2011-10-12 01:30:14 +01:00
Melanie 30b2fc6aea Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge 2011-10-12 01:29:47 +01:00
Melanie 59e3ac1ec6 Fix rezzing coalesced object broken by core merge 2011-10-12 00:50:13 +02:00
Melanie 1c2b5d99c9 Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge 2011-10-12 00:10:15 +02:00
Melanie e4f3ba8610 Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
 2011-10-12 00:10:30 +01:00
Melanie a9af618842 Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2011-10-11 23:32:16 +01:00
Melanie 0b96991ab4 Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge 2011-10-11 23:28:16 +01:00
Melanie b8e22b25fd Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
 2011-10-11 23:28:06 +01:00
Melanie 1ca86114e1 Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmerge 2011-10-11 23:22:23 +01:00
Melanie 3359bafc3e Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge 2011-10-11 23:22:08 +01:00
Melanie 1b3ea64fe9 Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-10-11 23:21:36 +01:00
Melanie ef9a811ea6 Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
 2011-10-11 23:17:47 +01:00
Melanie 7891433148 Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge 2011-10-11 23:16:43 +01:00
Melanie 0ae63d0e8b Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmerge 
Conflicts:
	OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
	OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
 2011-10-11 23:16:19 +01:00
Melanie efaa113fb9 Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmerge 2011-10-11 23:15:41 +01:00
Melanie 95a1a804bf Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge 2011-10-11 23:15:29 +01:00
Melanie ae67eb0a1f Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge 2011-10-11 23:15:17 +01:00
Melanie d1e681f682 Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2011-10-11 23:14:23 +01:00
Melanie 61a8e35b7d Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge 2011-10-11 23:08:38 +01:00
Melanie b9826035f6 Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge 2011-10-11 23:08:18 +01:00
Melanie a157fdedcf Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2011-10-11 23:08:07 +01:00
Melanie 66c06c5685 Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge 2011-10-11 23:02:19 +01:00
Melanie ea8350a526 Merge commit 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmerge 2011-10-11 23:02:04 +01:00
Melanie 5536cdf90c Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge 
Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
 2011-10-11 23:01:52 +01:00
Melanie ed1bb2081e Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge 2011-10-11 22:54:03 +01:00
Melanie 308b6937ad Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmerge 2011-10-11 22:53:53 +01:00
Melanie 83ec064868 Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2011-10-11 22:53:27 +01:00
Melanie b40157fc9b Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
 2011-10-11 22:51:44 +01:00
Melanie 75fd256ef8 Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge 2011-10-11 22:43:27 +01:00
Melanie 833420e167 Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge 2011-10-11 22:42:51 +01:00
Melanie 652c59c0a9 Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge 2011-10-11 22:42:18 +01:00
Melanie 2e47d24832 Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-10-11 22:41:51 +01:00